Skip to content

Commit 856200c

Browse files
committed
adds parent check to elements shifted within the dom, updates svg cleanup functions
1 parent ba7a702 commit 856200c

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

packages/@react-facet/deferred-mount/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
3232
"version": "0.5.4",
33-
"main": "src/index.tsx",
33+
"main": "dist/index.js",
3434
"publishConfig": {
3535
"main": "dist/index.js",
3636
"types": "dist/index.d.ts"

packages/@react-facet/dom-fiber/src/setupHostConfig.ts

+39-1
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,10 @@ export const setupHostConfig = (): HostConfig<
10151015
},
10161016

10171017
insertBefore: function (parentInstance, child, beforeChild) {
1018+
if (isElementContainer(child)) {
1019+
parentInstance.children.add(child)
1020+
}
1021+
10181022
parentInstance.element.insertBefore(child.element, beforeChild.element)
10191023
},
10201024

@@ -1027,6 +1031,10 @@ export const setupHostConfig = (): HostConfig<
10271031
},
10281032

10291033
insertInContainerBefore: function (container, child, beforeChild) {
1034+
if (isElementContainer(child)) {
1035+
container.children.add(child)
1036+
}
1037+
10301038
container.element.insertBefore(child.element, beforeChild.element)
10311039
},
10321040

@@ -1061,25 +1069,55 @@ const cleanupElementContainer = (parent: ElementContainer, instance: ElementCont
10611069
instance.children.clear()
10621070

10631071
instance.className?.()
1072+
instance.cx?.()
1073+
instance.cy?.()
1074+
instance.d?.()
10641075
instance['data-droppable']?.()
10651076
instance['data-narrate']?.()
10661077
instance['data-narrate-as']?.()
10671078
instance['data-narrate-after']?.()
10681079
instance['data-narrate-before']?.()
10691080
instance['data-testid']?.()
10701081
instance['data-x-ray']?.()
1082+
instance.fill?.()
10711083
instance.id?.()
10721084
instance.src?.()
1085+
instance.height?.()
10731086
instance.href?.()
10741087
instance.target?.()
10751088
instance.autoPlay?.()
10761089
instance.loop?.()
10771090
instance.disabled?.()
10781091
instance.maxLength?.()
1092+
instance.r?.()
1093+
instance.rx?.()
1094+
instance.ry?.()
10791095
instance.rows?.()
1080-
instance.value?.()
1096+
instance.stroke?.()
1097+
instance.strokeWidth?.()
10811098
instance.type?.()
10821099
instance.text?.()
1100+
instance.value?.()
1101+
instance.x?.()
1102+
instance.x1?.()
1103+
instance.x2?.()
1104+
instance.width?.()
1105+
instance.y?.()
1106+
instance.y1?.()
1107+
instance.y2?.()
1108+
instance.viewBox?.()
1109+
instance.xLinkHref?.()
1110+
instance.fillOpacity?.()
1111+
instance.strokeOpacity?.()
1112+
instance.strokeLinecap?.()
1113+
instance.strokeLinejoin?.()
1114+
instance.points?.()
1115+
instance.offset?.()
1116+
instance.stopColor?.()
1117+
instance.stopOpacity?.()
1118+
instance.fontFamily?.()
1119+
instance.fontSize?.()
1120+
instance.cohinline?.()
10831121
}
10841122

10851123
const noop = () => {}

0 commit comments

Comments
 (0)