Rewrite xilem_web to support new xilem_core

Cargo.toml

@@ -6,7 +6,6 @@ members = [
     "masonry",
 
     "xilem_web",
-    "xilem_web/xilem_web_core",
     "xilem_web/web_examples/counter",
     "xilem_web/web_examples/counter_custom_element",
     "xilem_web/web_examples/todomvc",

xilem_core/README.md

@@ -23,7 +23,7 @@
 
 </div>
 
-Xilem Core provides primitives which are used by [Xilem][] (a cross-platform GUI toolkit). <!-- and Xilem Web (a web frontend framework) -->
+Xilem Core provides primitives which are used by [Xilem][] (a cross-platform GUI toolkit) and [Xilem Web][] (a web frontend framework).
 If you are using Xilem, [its documentation][xilem docs] will probably be more helpful for you. <!-- TODO: In the long-term, we probably also need a book? -->
 
 Xilem apps will interact with some of the functions from this crate, in particular [`memoize`][].
@@ -73,6 +73,7 @@ Contributions are welcome by pull request. The [Rust code of conduct][] applies.
 
 [LICENSE]: LICENSE
 [Xilem]: https://crates.io/crates/xilem
+[Xilem Web]: https://crates.io/crates/xilem_web
 [xilem docs]: https://docs.rs/xilem/latest/xilem/
 [`memoize`]: https://docs.rs/xilem_core/latest/xilem_core/views/memoize/fn.memoize.html
 [`View`]: https://docs.rs/xilem_core/latest/xilem_core/view/trait.View.html

xilem_core/src/message.rs

@@ -43,15 +43,11 @@ impl<A, Message> MessageResult<A, Message> {
 /// A dynamically typed message for the [`View`] trait.
 ///
 /// Mostly equivalent to `Box<dyn Any>`, but with support for debug printing.
-// We can't use intra-doc links here because of
+// We can't use intra-doc links here because of rustdoc doesn't understand impls on `dyn Message`
 /// The primary interface for this type is [`dyn Message::downcast`](trait.Message.html#method.downcast).
 ///
 /// These messages must also be [`Send`].
 /// This makes using this message type in a multithreaded context easier.
-/// If this requirement is causing you issues, feel free to open an issue
-/// to discuss.
-/// We are aware of potential backwards-compatible workarounds, but
-/// are not aware of any tangible need for this.
 ///
 /// [`View`]: crate::View
 pub type DynMessage = Box<dyn Message>;

xilem_web/Cargo.toml

@@ -2,7 +2,7 @@
 name = "xilem_web"
 version = "0.1.0"
 description = "HTML DOM frontend for the Xilem Rust UI framework."
-keywords = ["xilem", "html", "dom", "web", "ui"]
+keywords = ["xilem", "html", "svg", "dom", "web", "ui"]
 categories = ["gui", "web-programming"]
 publish = false                                                    # Until it's ready
 edition.workspace = true
@@ -19,155 +19,152 @@ cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
 workspace = true
 
 [dependencies]
-xilem_web_core = { workspace = true }
+xilem_core = { workspace = true, features = ["kurbo"] }
 peniko.workspace = true
-bitflags.workspace = true
 wasm-bindgen = "0.2.92"
-paste = "1.0.15"
-log = "0.4.21"
-gloo = { version = "0.11.0", default-features = false, features = ["events"] }
 
 [dependencies.web-sys]
 version = "0.3.69"
 features = [
-    "console",
-    "CssStyleDeclaration",
-    "Document",
-    "DomTokenList",
-    "Element",
-    "Event",
-    "HtmlElement",
-    "Node",
-    "NodeList",
-    "SvgElement",
-    "SvgaElement",
-    "SvgAnimateElement",
-    "SvgAnimateMotionElement",
-    "SvgAnimateTransformElement",
-    "SvgCircleElement",
-    "SvgClipPathElement",
-    "SvgDefsElement",
-    "SvgDescElement",
-    "SvgEllipseElement",
-    "SvgfeBlendElement",
-    "SvgfeColorMatrixElement",
-    "SvgfeComponentTransferElement",
-    "SvgfeCompositeElement",
-    "SvgfeConvolveMatrixElement",
-    "SvgfeDiffuseLightingElement",
-    "SvgfeDisplacementMapElement",
-    "SvgfeDistantLightElement",
-    "SvgfeDropShadowElement",
-    "SvgfeFloodElement",
-    "SvgfeFuncAElement",
-    "SvgfeFuncBElement",
-    "SvgfeFuncGElement",
-    "SvgfeFuncRElement",
-    "SvgfeGaussianBlurElement",
-    "SvgfeImageElement",
-    "SvgfeMergeElement",
-    "SvgfeMergeNodeElement",
-    "SvgfeMorphologyElement",
-    "SvgfeOffsetElement",
-    "SvgfePointLightElement",
-    "SvgfeSpecularLightingElement",
-    "SvgfeSpotLightElement",
-    "SvgfeTileElement",
-    "SvgfeTurbulenceElement",
-    "SvgFilterElement",
-    "SvgForeignObjectElement",
-    "SvggElement",
-    # "SvgHatchElement",
-    # "SvgHatchpathElement",
-    "SvgImageElement",
-    "SvgLineElement",
-    "SvgLinearGradientElement",
-    "SvgMarkerElement",
-    "SvgMaskElement",
-    "SvgMetadataElement",
-    "SvgmPathElement",
-    "SvgPathElement",
-    "SvgPatternElement",
-    "SvgPolygonElement",
-    "SvgPolylineElement",
-    "SvgRadialGradientElement",
-    "SvgRectElement",
-    "SvgScriptElement",
-    "SvgSetElement",
-    "SvgStopElement",
-    "SvgStyleElement",
-    "SvgsvgElement",
-    "SvgSwitchElement",
-    "SvgSymbolElement",
-    "SvgTextElement",
-    "SvgTextPathElement",
-    "SvgTitleElement",
-    "SvgtSpanElement",
-    "SvgUseElement",
-    "SvgViewElement",
-    "Text",
-    "Window",
-    "FocusEvent",
-    "HtmlInputElement",
-    "InputEvent",
-    "KeyboardEvent",
-    "MouseEvent",
-    "PointerEvent",
-    "WheelEvent",
-    "HtmlAnchorElement",
-    "HtmlAreaElement",
-    "HtmlAudioElement",
-    "HtmlBrElement",
-    "HtmlButtonElement",
-    "HtmlCanvasElement",
-    "HtmlDataElement",
-    "HtmlDataListElement",
-    "HtmlDetailsElement",
-    "HtmlDialogElement",
-    "HtmlDivElement",
-    "HtmlDListElement",
-    "HtmlEmbedElement",
-    "HtmlFieldSetElement",
-    "HtmlFormElement",
-    "HtmlHeadingElement",
-    "HtmlHrElement",
-    "HtmlIFrameElement",
-    "HtmlImageElement",
-    "HtmlInputElement",
-    "HtmlLabelElement",
-    "HtmlLegendElement",
-    "HtmlLiElement",
-    "HtmlLinkElement",
-    "HtmlMapElement",
-    "HtmlMediaElement",
-    "HtmlMenuElement",
-    "HtmlMeterElement",
-    "HtmlModElement",
-    "HtmlObjectElement",
-    "HtmlOListElement",
-    "HtmlOptGroupElement",
-    "HtmlOptionElement",
-    "HtmlOutputElement",
-    "HtmlParagraphElement",
-    "HtmlPictureElement",
-    "HtmlPreElement",
-    "HtmlProgressElement",
-    "HtmlQuoteElement",
-    "HtmlScriptElement",
-    "HtmlSelectElement",
-    "HtmlSlotElement",
-    "HtmlSourceElement",
-    "HtmlSpanElement",
-    "HtmlTableCaptionElement",
-    "HtmlTableCellElement",
-    "HtmlTableColElement",
-    "HtmlTableElement",
-    "HtmlTableRowElement",
-    "HtmlTableSectionElement",
-    "HtmlTemplateElement",
-    "HtmlTimeElement",
-    "HtmlTextAreaElement",
-    "HtmlTrackElement",
-    "HtmlUListElement",
-    "HtmlVideoElement",
+  "console",
+  "CssStyleDeclaration",
+  "Document",
+  "DomTokenList",
+  "Element",
+  "Event",
+  "AddEventListenerOptions",
+  "HtmlElement",
+  "Node",
+  "NodeList",
+  "SvgElement",
+  "SvgaElement",
+  "SvgAnimateElement",
+  "SvgAnimateMotionElement",
+  "SvgAnimateTransformElement",
+  "SvgCircleElement",
+  "SvgClipPathElement",
+  "SvgDefsElement",
+  "SvgDescElement",
+  "SvgEllipseElement",
+  "SvgfeBlendElement",
+  "SvgfeColorMatrixElement",
+  "SvgfeComponentTransferElement",
+  "SvgfeCompositeElement",
+  "SvgfeConvolveMatrixElement",
+  "SvgfeDiffuseLightingElement",
+  "SvgfeDisplacementMapElement",
+  "SvgfeDistantLightElement",
+  "SvgfeDropShadowElement",
+  "SvgfeFloodElement",
+  "SvgfeFuncAElement",
+  "SvgfeFuncBElement",
+  "SvgfeFuncGElement",
+  "SvgfeFuncRElement",
+  "SvgfeGaussianBlurElement",
+  "SvgfeImageElement",
+  "SvgfeMergeElement",
+  "SvgfeMergeNodeElement",
+  "SvgfeMorphologyElement",
+  "SvgfeOffsetElement",
+  "SvgfePointLightElement",
+  "SvgfeSpecularLightingElement",
+  "SvgfeSpotLightElement",
+  "SvgfeTileElement",
+  "SvgfeTurbulenceElement",
+  "SvgFilterElement",
+  "SvgForeignObjectElement",
+  "SvggElement",
+  # "SvgHatchElement",
+  # "SvgHatchpathElement",
+  "SvgImageElement",
+  "SvgLineElement",
+  "SvgLinearGradientElement",
+  "SvgMarkerElement",
+  "SvgMaskElement",
+  "SvgMetadataElement",
+  "SvgmPathElement",
+  "SvgPathElement",
+  "SvgPatternElement",
+  "SvgPolygonElement",
+  "SvgPolylineElement",
+  "SvgRadialGradientElement",
+  "SvgRectElement",
+  "SvgScriptElement",
+  "SvgSetElement",
+  "SvgStopElement",
+  "SvgStyleElement",
+  "SvgsvgElement",
+  "SvgSwitchElement",
+  "SvgSymbolElement",
+  "SvgTextElement",
+  "SvgTextPathElement",
+  "SvgTitleElement",
+  "SvgtSpanElement",
+  "SvgUseElement",
+  "SvgViewElement",
+  "Text",
+  "Window",
+  "FocusEvent",
+  "HtmlInputElement",
+  "InputEvent",
+  "KeyboardEvent",
+  "MouseEvent",
+  "PointerEvent",
+  "WheelEvent",
+  "HtmlAnchorElement",
+  "HtmlAreaElement",
+  "HtmlAudioElement",
+  "HtmlBrElement",
+  "HtmlButtonElement",
+  "HtmlCanvasElement",
+  "HtmlDataElement",
+  "HtmlDataListElement",
+  "HtmlDetailsElement",
+  "HtmlDialogElement",
+  "HtmlDivElement",
+  "HtmlDListElement",
+  "HtmlEmbedElement",
+  "HtmlFieldSetElement",
+  "HtmlFormElement",
+  "HtmlHeadingElement",
+  "HtmlHrElement",
+  "HtmlIFrameElement",
+  "HtmlImageElement",
+  "HtmlInputElement",
+  "HtmlLabelElement",
+  "HtmlLegendElement",
+  "HtmlLiElement",
+  "HtmlLinkElement",
+  "HtmlMapElement",
+  "HtmlMediaElement",
+  "HtmlMenuElement",
+  "HtmlMeterElement",
+  "HtmlModElement",
+  "HtmlObjectElement",
+  "HtmlOListElement",
+  "HtmlOptGroupElement",
+  "HtmlOptionElement",
+  "HtmlOutputElement",
+  "HtmlParagraphElement",
+  "HtmlPictureElement",
+  "HtmlPreElement",
+  "HtmlProgressElement",
+  "HtmlQuoteElement",
+  "HtmlScriptElement",
+  "HtmlSelectElement",
+  "HtmlSlotElement",
+  "HtmlSourceElement",
+  "HtmlSpanElement",
+  "HtmlTableCaptionElement",
+  "HtmlTableCellElement",
+  "HtmlTableColElement",
+  "HtmlTableElement",
+  "HtmlTableRowElement",
+  "HtmlTableSectionElement",
+  "HtmlTemplateElement",
+  "HtmlTimeElement",
+  "HtmlTextAreaElement",
+  "HtmlTrackElement",
+  "HtmlUListElement",
+  "HtmlVideoElement",
 ]