adds parent check to elements shifted within the dom, updates svg cle…

…anup functions
Mojang · Apr 8, 2024 · 856200c · 856200c
1 parent ba7a702
commit 856200c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/packages/@react-facet/deferred-mount/package.json b/packages/@react-facet/deferred-mount/package.json
@@ -30,7 +30,7 @@
   "bugs": "https://github.com/Mojang/ore-ui/issues",
   "license": "MIT",
   "version": "0.5.4",
-  "main": "src/index.tsx",
+  "main": "dist/index.js",
   "publishConfig": {
     "main": "dist/index.js",
     "types": "dist/index.d.ts"

diff --git a/packages/@react-facet/dom-fiber/src/setupHostConfig.ts b/packages/@react-facet/dom-fiber/src/setupHostConfig.ts
@@ -1015,6 +1015,10 @@ export const setupHostConfig = (): HostConfig<
   },
 
   insertBefore: function (parentInstance, child, beforeChild) {
+    if (isElementContainer(child)) {
+      parentInstance.children.add(child)
+    }
+
     parentInstance.element.insertBefore(child.element, beforeChild.element)
   },
 
@@ -1027,6 +1031,10 @@ export const setupHostConfig = (): HostConfig<
   },
 
   insertInContainerBefore: function (container, child, beforeChild) {
+    if (isElementContainer(child)) {
+      container.children.add(child)
+    }
+
     container.element.insertBefore(child.element, beforeChild.element)
   },
 
@@ -1061,25 +1069,55 @@ const cleanupElementContainer = (parent: ElementContainer, instance: ElementCont
   instance.children.clear()
 
   instance.className?.()
+  instance.cx?.()
+  instance.cy?.()
+  instance.d?.()
   instance['data-droppable']?.()
   instance['data-narrate']?.()
   instance['data-narrate-as']?.()
   instance['data-narrate-after']?.()
   instance['data-narrate-before']?.()
   instance['data-testid']?.()
   instance['data-x-ray']?.()
+  instance.fill?.()
   instance.id?.()
   instance.src?.()
+  instance.height?.()
   instance.href?.()
   instance.target?.()
   instance.autoPlay?.()
   instance.loop?.()
   instance.disabled?.()
   instance.maxLength?.()
+  instance.r?.()
+  instance.rx?.()
+  instance.ry?.()
   instance.rows?.()
-  instance.value?.()
+  instance.stroke?.()
+  instance.strokeWidth?.()
   instance.type?.()
   instance.text?.()
+  instance.value?.()
+  instance.x?.()
+  instance.x1?.()
+  instance.x2?.()
+  instance.width?.()
+  instance.y?.()
+  instance.y1?.()
+  instance.y2?.()
+  instance.viewBox?.()
+  instance.xLinkHref?.()
+  instance.fillOpacity?.()
+  instance.strokeOpacity?.()
+  instance.strokeLinecap?.()
+  instance.strokeLinejoin?.()
+  instance.points?.()
+  instance.offset?.()
+  instance.stopColor?.()
+  instance.stopOpacity?.()
+  instance.fontFamily?.()
+  instance.fontSize?.()
+  instance.cohinline?.()
 }
 
 const noop = () => {}