diff --git a/implementations/Crafter.CppDOM-HtmlElement.cpp b/implementations/Crafter.CppDOM-HtmlElement.cpp index 01ed75a..199f157 100644 --- a/implementations/Crafter.CppDOM-HtmlElement.cpp +++ b/implementations/Crafter.CppDOM-HtmlElement.cpp @@ -26,43 +26,43 @@ import :BindingsImport; import :EventTypes; namespace Crafter { - HtmlElement::HtmlElement(const std::string_view id): ptr(CppDOMBindings::GetElementById(id)) { + HtmlElementView::HtmlElementView(const std::string_view id): ptr(CppDOMBindings::GetElementById(id)) { } - HtmlElement::HtmlElement(const std::string_view id, const std::string_view html): ptr(CppDOMBindings::GetElementById(id)) { + HtmlElementView::HtmlElementView(const std::string_view id, const std::string_view html): ptr(CppDOMBindings::GetElementById(id)) { CppDOMBindings::SetInnerHTML(ptr, html); } - void HtmlElement::SetInnerHTML(const std::string_view html) { + void HtmlElementView::SetInnerHTML(const std::string_view html) { CppDOMBindings::SetInnerHTML(ptr, html); } - void HtmlElement::SetStyle(const std::string_view style) { + void HtmlElementView::SetStyle(const std::string_view style) { CppDOMBindings::SetStyle(ptr, style); } - void HtmlElement::SetProperty(const std::string_view property, const std::string_view value) { + void HtmlElementView::SetProperty(const std::string_view property, const std::string_view value) { CppDOMBindings::SetProperty(ptr, property, value); } - void HtmlElement::AddClass(const std::string_view className) { + void HtmlElementView::AddClass(const std::string_view className) { CppDOMBindings::AddClass(ptr, className); } - void HtmlElement::RemoveClass(const std::string_view className) { + void HtmlElementView::RemoveClass(const std::string_view className) { CppDOMBindings::RemoveClass(ptr, className); } - void HtmlElement::ToggleClass(const std::string_view className) { + void HtmlElementView::ToggleClass(const std::string_view className) { CppDOMBindings::ToggleClass(ptr, className); } - bool HtmlElement::HasClass(const std::string_view className) { + bool HtmlElementView::HasClass(const std::string_view className) { return CppDOMBindings::HasClass(ptr, className); } - std::int32_t HtmlElement::AddClickListener(std::function callback) { + std::int32_t HtmlElementView::AddClickListener(std::function callback) { std::int32_t id = CppDOMBindings::clickHandlerMaxId++; clickHandlers.push_back(id); CppDOMBindings::clickHandlers->insert({id, callback}); @@ -70,13 +70,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveClickListener(std::int32_t id) { + void HtmlElementView::RemoveClickListener(std::int32_t id) { clickHandlers.erase(std::remove(clickHandlers.begin(), clickHandlers.end(), id), clickHandlers.end()); CppDOMBindings::clickHandlers->erase(id); CppDOMBindings::RemoveClickListener(ptr, id); } - std::int32_t HtmlElement::AddMouseOverListener(std::function callback) { + std::int32_t HtmlElementView::AddMouseOverListener(std::function callback) { std::int32_t id = CppDOMBindings::mouseOverHandlerMaxId++; mouseOverHandlers.push_back(id); CppDOMBindings::mouseOverHandlers->insert({id, callback}); @@ -84,13 +84,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveMouseOverListener(std::int32_t id) { + void HtmlElementView::RemoveMouseOverListener(std::int32_t id) { mouseOverHandlers.erase(std::remove(mouseOverHandlers.begin(), mouseOverHandlers.end(), id), mouseOverHandlers.end()); CppDOMBindings::mouseOverHandlers->erase(id); CppDOMBindings::RemoveMouseOverListener(ptr, id); } - std::int32_t HtmlElement::AddMouseOutListener(std::function callback) { + std::int32_t HtmlElementView::AddMouseOutListener(std::function callback) { std::int32_t id = CppDOMBindings::mouseOutHandlerMaxId++; mouseOutHandlers.push_back(id); CppDOMBindings::mouseOutHandlers->insert({id, callback}); @@ -98,13 +98,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveMouseOutListener(std::int32_t id) { + void HtmlElementView::RemoveMouseOutListener(std::int32_t id) { mouseOutHandlers.erase(std::remove(mouseOutHandlers.begin(), mouseOutHandlers.end(), id), mouseOutHandlers.end()); CppDOMBindings::mouseOutHandlers->erase(id); CppDOMBindings::RemoveMouseOutListener(ptr, id); } - std::int32_t HtmlElement::AddMouseMoveListener(std::function callback) { + std::int32_t HtmlElementView::AddMouseMoveListener(std::function callback) { std::int32_t id = CppDOMBindings::mouseMoveHandlerMaxId++; mouseMoveHandlers.push_back(id); CppDOMBindings::mouseMoveHandlers->insert({id, callback}); @@ -112,13 +112,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveMouseMoveListener(std::int32_t id) { + void HtmlElementView::RemoveMouseMoveListener(std::int32_t id) { mouseMoveHandlers.erase(std::remove(mouseMoveHandlers.begin(), mouseMoveHandlers.end(), id), mouseMoveHandlers.end()); CppDOMBindings::mouseMoveHandlers->erase(id); CppDOMBindings::RemoveMouseMoveListener(ptr, id); } - std::int32_t HtmlElement::AddMouseDownListener(std::function callback) { + std::int32_t HtmlElementView::AddMouseDownListener(std::function callback) { std::int32_t id = CppDOMBindings::mouseDownHandlerMaxId++; mouseDownHandlers.push_back(id); CppDOMBindings::mouseDownHandlers->insert({id, callback}); @@ -126,13 +126,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveMouseDownListener(std::int32_t id) { + void HtmlElementView::RemoveMouseDownListener(std::int32_t id) { mouseDownHandlers.erase(std::remove(mouseDownHandlers.begin(), mouseDownHandlers.end(), id), mouseDownHandlers.end()); CppDOMBindings::mouseDownHandlers->erase(id); CppDOMBindings::RemoveMouseDownListener(ptr, id); } - std::int32_t HtmlElement::AddMouseUpListener(std::function callback) { + std::int32_t HtmlElementView::AddMouseUpListener(std::function callback) { std::int32_t id = CppDOMBindings::mouseUpHandlerMaxId++; mouseUpHandlers.push_back(id); CppDOMBindings::mouseUpHandlers->insert({id, callback}); @@ -140,13 +140,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveMouseUpListener(std::int32_t id) { + void HtmlElementView::RemoveMouseUpListener(std::int32_t id) { mouseUpHandlers.erase(std::remove(mouseUpHandlers.begin(), mouseUpHandlers.end(), id), mouseUpHandlers.end()); CppDOMBindings::mouseUpHandlers->erase(id); CppDOMBindings::RemoveMouseUpListener(ptr, id); } - std::int32_t HtmlElement::AddFocusListener(std::function callback) { + std::int32_t HtmlElementView::AddFocusListener(std::function callback) { std::int32_t id = CppDOMBindings::focusHandlerMaxId++; focusHandlers.push_back(id); CppDOMBindings::focusHandlers->insert({id, callback}); @@ -154,13 +154,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveFocusListener(std::int32_t id) { + void HtmlElementView::RemoveFocusListener(std::int32_t id) { focusHandlers.erase(std::remove(focusHandlers.begin(), focusHandlers.end(), id), focusHandlers.end()); CppDOMBindings::focusHandlers->erase(id); CppDOMBindings::RemoveFocusListener(ptr, id); } - std::int32_t HtmlElement::AddBlurListener(std::function callback) { + std::int32_t HtmlElementView::AddBlurListener(std::function callback) { std::int32_t id = CppDOMBindings::blurHandlerMaxId++; blurHandlers.push_back(id); CppDOMBindings::blurHandlers->insert({id, callback}); @@ -168,13 +168,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveBlurListener(std::int32_t id) { + void HtmlElementView::RemoveBlurListener(std::int32_t id) { blurHandlers.erase(std::remove(blurHandlers.begin(), blurHandlers.end(), id), blurHandlers.end()); CppDOMBindings::blurHandlers->erase(id); CppDOMBindings::RemoveBlurListener(ptr, id); } - std::int32_t HtmlElement::AddKeyDownListener(std::function callback) { + std::int32_t HtmlElementView::AddKeyDownListener(std::function callback) { std::int32_t id = CppDOMBindings::keyDownHandlerMaxId++; keyDownHandlers.push_back(id); CppDOMBindings::keyDownHandlers->insert({id, callback}); @@ -182,13 +182,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveKeyDownListener(std::int32_t id) { + void HtmlElementView::RemoveKeyDownListener(std::int32_t id) { keyDownHandlers.erase(std::remove(keyDownHandlers.begin(), keyDownHandlers.end(), id), keyDownHandlers.end()); CppDOMBindings::keyDownHandlers->erase(id); CppDOMBindings::RemoveKeyDownListener(ptr, id); } - std::int32_t HtmlElement::AddKeyUpListener(std::function callback) { + std::int32_t HtmlElementView::AddKeyUpListener(std::function callback) { std::int32_t id = CppDOMBindings::keyUpHandlerMaxId++; keyUpHandlers.push_back(id); CppDOMBindings::keyUpHandlers->insert({id, callback}); @@ -196,13 +196,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveKeyUpListener(std::int32_t id) { + void HtmlElementView::RemoveKeyUpListener(std::int32_t id) { keyUpHandlers.erase(std::remove(keyUpHandlers.begin(), keyUpHandlers.end(), id), keyUpHandlers.end()); CppDOMBindings::keyUpHandlers->erase(id); CppDOMBindings::RemoveKeyUpListener(ptr, id); } - std::int32_t HtmlElement::AddKeyPressListener(std::function callback) { + std::int32_t HtmlElementView::AddKeyPressListener(std::function callback) { std::int32_t id = CppDOMBindings::keyPressHandlerMaxId++; keyPressHandlers.push_back(id); CppDOMBindings::keyPressHandlers->insert({id, callback}); @@ -210,13 +210,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveKeyPressListener(std::int32_t id) { + void HtmlElementView::RemoveKeyPressListener(std::int32_t id) { keyPressHandlers.erase(std::remove(keyPressHandlers.begin(), keyPressHandlers.end(), id), keyPressHandlers.end()); CppDOMBindings::keyPressHandlers->erase(id); CppDOMBindings::RemoveKeyPressListener(ptr, id); } - std::int32_t HtmlElement::AddChangeListener(std::function callback) { + std::int32_t HtmlElementView::AddChangeListener(std::function callback) { std::int32_t id = CppDOMBindings::changeHandlerMaxId++; changeHandlers.push_back(id); CppDOMBindings::changeHandlers->insert({id, callback}); @@ -224,13 +224,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveChangeListener(std::int32_t id) { + void HtmlElementView::RemoveChangeListener(std::int32_t id) { changeHandlers.erase(std::remove(changeHandlers.begin(), changeHandlers.end(), id), changeHandlers.end()); CppDOMBindings::changeHandlers->erase(id); CppDOMBindings::RemoveChangeListener(ptr, id); } - std::int32_t HtmlElement::AddSubmitListener(std::function callback) { + std::int32_t HtmlElementView::AddSubmitListener(std::function callback) { std::int32_t id = CppDOMBindings::submitHandlerMaxId++; submitHandlers.push_back(id); CppDOMBindings::submitHandlers->insert({id, callback}); @@ -238,13 +238,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveSubmitListener(std::int32_t id) { + void HtmlElementView::RemoveSubmitListener(std::int32_t id) { submitHandlers.erase(std::remove(submitHandlers.begin(), submitHandlers.end(), id), submitHandlers.end()); CppDOMBindings::submitHandlers->erase(id); CppDOMBindings::RemoveSubmitListener(ptr, id); } - std::int32_t HtmlElement::AddInputListener(std::function callback) { + std::int32_t HtmlElementView::AddInputListener(std::function callback) { std::int32_t id = CppDOMBindings::inputHandlerMaxId++; inputHandlers.push_back(id); CppDOMBindings::inputHandlers->insert({id, callback}); @@ -252,13 +252,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveInputListener(std::int32_t id) { + void HtmlElementView::RemoveInputListener(std::int32_t id) { inputHandlers.erase(std::remove(inputHandlers.begin(), inputHandlers.end(), id), inputHandlers.end()); CppDOMBindings::inputHandlers->erase(id); CppDOMBindings::RemoveInputListener(ptr, id); } - std::int32_t HtmlElement::AddResizeListener(std::function callback) { + std::int32_t HtmlElementView::AddResizeListener(std::function callback) { std::int32_t id = CppDOMBindings::resizeHandlerMaxId++; resizeHandlers.push_back(id); CppDOMBindings::resizeHandlers->insert({id, callback}); @@ -266,13 +266,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveResizeListener(std::int32_t id) { + void HtmlElementView::RemoveResizeListener(std::int32_t id) { resizeHandlers.erase(std::remove(resizeHandlers.begin(), resizeHandlers.end(), id), resizeHandlers.end()); CppDOMBindings::resizeHandlers->erase(id); CppDOMBindings::RemoveResizeListener(ptr, id); } - std::int32_t HtmlElement::AddScrollListener(std::function callback) { + std::int32_t HtmlElementView::AddScrollListener(std::function callback) { std::int32_t id = CppDOMBindings::scrollHandlerMaxId++; scrollHandlers.push_back(id); CppDOMBindings::scrollHandlers->insert({id, callback}); @@ -280,13 +280,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveScrollListener(std::int32_t id) { + void HtmlElementView::RemoveScrollListener(std::int32_t id) { scrollHandlers.erase(std::remove(scrollHandlers.begin(), scrollHandlers.end(), id), scrollHandlers.end()); CppDOMBindings::scrollHandlers->erase(id); CppDOMBindings::RemoveScrollListener(ptr, id); } - std::int32_t HtmlElement::AddContextMenuListener(std::function callback) { + std::int32_t HtmlElementView::AddContextMenuListener(std::function callback) { std::int32_t id = CppDOMBindings::contextMenuHandlerMaxId++; contextMenuHandlers.push_back(id); CppDOMBindings::contextMenuHandlers->insert({id, callback}); @@ -294,13 +294,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveContextMenuListener(std::int32_t id) { + void HtmlElementView::RemoveContextMenuListener(std::int32_t id) { contextMenuHandlers.erase(std::remove(contextMenuHandlers.begin(), contextMenuHandlers.end(), id), contextMenuHandlers.end()); CppDOMBindings::contextMenuHandlers->erase(id); CppDOMBindings::RemoveContextMenuListener(ptr, id); } - std::int32_t HtmlElement::AddDragStartListener(std::function callback) { + std::int32_t HtmlElementView::AddDragStartListener(std::function callback) { std::int32_t id = CppDOMBindings::dragStartHandlerMaxId++; dragStartHandlers.push_back(id); CppDOMBindings::dragStartHandlers->insert({id, callback}); @@ -308,13 +308,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDragStartListener(std::int32_t id) { + void HtmlElementView::RemoveDragStartListener(std::int32_t id) { dragStartHandlers.erase(std::remove(dragStartHandlers.begin(), dragStartHandlers.end(), id), dragStartHandlers.end()); CppDOMBindings::dragStartHandlers->erase(id); CppDOMBindings::RemoveDragStartListener(ptr, id); } - std::int32_t HtmlElement::AddDragEndListener(std::function callback) { + std::int32_t HtmlElementView::AddDragEndListener(std::function callback) { std::int32_t id = CppDOMBindings::dragEndHandlerMaxId++; dragEndHandlers.push_back(id); CppDOMBindings::dragEndHandlers->insert({id, callback}); @@ -322,13 +322,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDragEndListener(std::int32_t id) { + void HtmlElementView::RemoveDragEndListener(std::int32_t id) { dragEndHandlers.erase(std::remove(dragEndHandlers.begin(), dragEndHandlers.end(), id), dragEndHandlers.end()); CppDOMBindings::dragEndHandlers->erase(id); CppDOMBindings::RemoveDragEndListener(ptr, id); } - std::int32_t HtmlElement::AddDropListener(std::function callback) { + std::int32_t HtmlElementView::AddDropListener(std::function callback) { std::int32_t id = CppDOMBindings::dropHandlerMaxId++; dropHandlers.push_back(id); CppDOMBindings::dropHandlers->insert({id, callback}); @@ -336,13 +336,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDropListener(std::int32_t id) { + void HtmlElementView::RemoveDropListener(std::int32_t id) { dropHandlers.erase(std::remove(dropHandlers.begin(), dropHandlers.end(), id), dropHandlers.end()); CppDOMBindings::dropHandlers->erase(id); CppDOMBindings::RemoveDropListener(ptr, id); } - std::int32_t HtmlElement::AddDragOverListener(std::function callback) { + std::int32_t HtmlElementView::AddDragOverListener(std::function callback) { std::int32_t id = CppDOMBindings::dragOverHandlerMaxId++; dragOverHandlers.push_back(id); CppDOMBindings::dragOverHandlers->insert({id, callback}); @@ -350,13 +350,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDragOverListener(std::int32_t id) { + void HtmlElementView::RemoveDragOverListener(std::int32_t id) { dragOverHandlers.erase(std::remove(dragOverHandlers.begin(), dragOverHandlers.end(), id), dragOverHandlers.end()); CppDOMBindings::dragOverHandlers->erase(id); CppDOMBindings::RemoveDragOverListener(ptr, id); } - std::int32_t HtmlElement::AddDragEnterListener(std::function callback) { + std::int32_t HtmlElementView::AddDragEnterListener(std::function callback) { std::int32_t id = CppDOMBindings::dragEnterHandlerMaxId++; dragEnterHandlers.push_back(id); CppDOMBindings::dragEnterHandlers->insert({id, callback}); @@ -364,13 +364,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDragEnterListener(std::int32_t id) { + void HtmlElementView::RemoveDragEnterListener(std::int32_t id) { dragEnterHandlers.erase(std::remove(dragEnterHandlers.begin(), dragEnterHandlers.end(), id), dragEnterHandlers.end()); CppDOMBindings::dragEnterHandlers->erase(id); CppDOMBindings::RemoveDragEnterListener(ptr, id); } - std::int32_t HtmlElement::AddDragLeaveListener(std::function callback) { + std::int32_t HtmlElementView::AddDragLeaveListener(std::function callback) { std::int32_t id = CppDOMBindings::dragLeaveHandlerMaxId++; dragLeaveHandlers.push_back(id); CppDOMBindings::dragLeaveHandlers->insert({id, callback}); @@ -378,13 +378,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveDragLeaveListener(std::int32_t id) { + void HtmlElementView::RemoveDragLeaveListener(std::int32_t id) { dragLeaveHandlers.erase(std::remove(dragLeaveHandlers.begin(), dragLeaveHandlers.end(), id), dragLeaveHandlers.end()); CppDOMBindings::dragLeaveHandlers->erase(id); CppDOMBindings::RemoveDragLeaveListener(ptr, id); } - std::int32_t HtmlElement::AddWheelListener(std::function callback) { + std::int32_t HtmlElementView::AddWheelListener(std::function callback) { std::int32_t id = CppDOMBindings::wheelHandlerMaxId++; wheelHandlers.push_back(id); CppDOMBindings::wheelHandlers->insert({id, callback}); @@ -392,13 +392,13 @@ namespace Crafter { return id; } - void HtmlElement::RemoveWheelListener(std::int32_t id) { + void HtmlElementView::RemoveWheelListener(std::int32_t id) { wheelHandlers.erase(std::remove(wheelHandlers.begin(), wheelHandlers.end(), id), wheelHandlers.end()); CppDOMBindings::wheelHandlers->erase(id); CppDOMBindings::RemoveWheelListener(ptr, id); } - HtmlElement::~HtmlElement(){ + HtmlElementView::~HtmlElementView(){ for(std::int32_t handler : clickHandlers) { CppDOMBindings::clickHandlers->erase(handler); CppDOMBindings::RemoveClickListener(ptr, handler); @@ -497,4 +497,18 @@ namespace Crafter { } CppDOMBindings::FreeJs(ptr); } -} \ No newline at end of file + + HtmlElement::HtmlElement(const std::string_view id): HtmlElementView(id) { + + } + + HtmlElement::HtmlElement(const std::string_view id, const std::string_view html): HtmlElementView(id, html) { + + } + + HtmlElement::~HtmlElement() { + + } + +} + diff --git a/interfaces/Crafter.CppDOM-HtmlElement.cppm b/interfaces/Crafter.CppDOM-HtmlElement.cppm index fe7bf8f..ebd5288 100644 --- a/interfaces/Crafter.CppDOM-HtmlElement.cppm +++ b/interfaces/Crafter.CppDOM-HtmlElement.cppm @@ -18,14 +18,14 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -export module Crafter.CppDOM:HtmlElement; +export module Crafter.CppDOM:HtmlElementView; import std; import :BindingsExport; import :BindingsImport; import :EventTypes; namespace Crafter { - export class HtmlElement { + export class HtmlElementView { public: void* const ptr; std::vector clickHandlers; @@ -53,8 +53,8 @@ namespace Crafter { std::vector dragLeaveHandlers; std::vector wheelHandlers; - HtmlElement(const std::string_view id); - HtmlElement(const std::string_view id, const std::string_view html); + HtmlElementView(const std::string_view id); + HtmlElementView(const std::string_view id, const std::string_view html); void SetInnerHTML(const std::string_view html); void SetStyle(const std::string_view style); void SetProperty(const std::string_view property, const std::string_view value); @@ -135,6 +135,12 @@ namespace Crafter { std::int32_t AddWheelListener(std::function callback); void RemoveWheelListener(std::int32_t id); - ~HtmlElement(); + ~HtmlElementView(); }; + + export class HtmlElement : public HtmlElementView { + HtmlElementView(const std::string_view id); + HtmlElementView(const std::string_view id, const std::string_view html); + ~HtmlElementView(); + } } \ No newline at end of file