@plurid/plurid-react 0.0.0-31 → 0.0.0-32

package/distribution/index.js

@@ -638,6 +638,10 @@ const space = toolkit.createSlice({
         },
         spaceSetCulledView: (state, action) => {
             state.culledView = action.payload;
+        },
+        removePlane: (state, action) => {
+            const updatedTree = pluridEngine.space.tree.logic.removePlaneFromTree(pluridFunctions.objects.clone(state.tree), action.payload);
+            state.tree = updatedTree;
         }
     }
 });
@@ -5733,7 +5737,7 @@ const PluridLink = properties => {
     if (!planesRegistry) {
         return React__default["default"].createElement(React__default["default"].Fragment, null, properties.children);
     }
-    const {children: children, route: planeRoute, devisible: devisibleProperty, suffix: suffixProperty, atClick: atClick, style: style, className: className, preview: preview, previewComponent: previewComponent, previewFadeIn: previewFadeIn, previewFadeOut: previewFadeOut, previewOffsetX: previewOffsetX, previewOffsetY: previewOffsetY, stateTree: stateTree, stateLastClosedPlane: stateLastClosedPlane, stateGeneralTheme: stateGeneralTheme, stateConfiguration: stateConfiguration, stateViewSize: stateViewSize, dispatch: dispatch, dispatchSetTree: dispatchSetTree, dispatchSetSpaceField: dispatchSetSpaceField, dispatchUpdateSpaceLinkCoordinates: dispatchUpdateSpaceLinkCoordinates} = properties;
+    const {children: children, route: planeRoute, devisible: devisibleProperty, suffix: suffixProperty, atClick: atClick, style: style, className: className, preview: preview, previewComponent: previewComponent, previewFadeIn: previewFadeIn, previewFadeOut: previewFadeOut, previewOffsetX: previewOffsetX, previewOffsetY: previewOffsetY, stateTree: stateTree, stateLastClosedPlane: stateLastClosedPlane, stateGeneralTheme: stateGeneralTheme, stateConfiguration: stateConfiguration, stateViewSize: stateViewSize, dispatch: dispatch, dispatchSetTree: dispatchSetTree, dispatchSetSpaceField: dispatchSetSpaceField, dispatchUpdateSpaceLinkCoordinates: dispatchUpdateSpaceLinkCoordinates, dispatchRemovePlane: dispatchRemovePlane} = properties;
     const planeControls = stateConfiguration.elements.plane.controls.show;
     const previewAppearTime = previewFadeIn || pluridData.PLURID_DEFAULT_CONFIGURATION_LINK_PREVIEW_FADE_IN;
     const previewDisappearTime = previewFadeOut || pluridData.PLURID_DEFAULT_CONFIGURATION_LINK_PREVIEW_FADE_OUT;
@@ -5744,7 +5748,6 @@ const PluridLink = properties => {
     const linkElement = React.useRef(null);
     const hoverInTimeout = React.useRef(null);
     const hoverOutTimeout = React.useRef(null);
-    const planeRef = React.useRef();
     const [mouseOver, setMouseOver] = React.useState(false);
     const [showPreview, setShowPreview] = React.useState(false);
     const [showLink, setShowLink] = React.useState(false);
@@ -5822,6 +5825,9 @@ const PluridLink = properties => {
                 continue;
             }
             if (plane.linkCoordinates.x === linkCoordinates.x || plane.linkCoordinates.y === linkCoordinates.y) {
+                if (pluridPlaneID === plane.planeID) {
+                    continue;
+                }
                 setShowLink(true);
                 setPluridPlaneID(plane.planeID);
             }
@@ -5887,9 +5893,12 @@ const PluridLink = properties => {
         }
     };
     const removePlane = () => {
-        const updatedTree = pluridEngine.space.tree.logic.removePlaneFromTree(pluridFunctions.objects.clone(stateTree), pluridPlaneID);
-        dispatchSetTree(updatedTree);
-        setShowLink((show => !show));
+        const pluridPlane = document.getElementById(pluridPlaneID);
+        if (!pluridPlane) {
+            return;
+        }
+        dispatchRemovePlane(pluridPlaneID);
+        setShowLink(false);
         setShowPreview(false);
     };
     const handleClick = React.useCallback((event => {
@@ -5909,11 +5918,11 @@ const PluridLink = properties => {
         return;
     };
     React.useEffect((() => {
-        const parentPlaneID = getPluridPlaneIDByData$1(linkElement.current);
-        setParentPlaneID(parentPlaneID);
+        const newParentPlaneID = getPluridPlaneIDByData$1(linkElement.current);
+        setParentPlaneID(newParentPlaneID);
         const linkCoordinates = getPluridLinkCoordinates();
         setLinkCoordinates(linkCoordinates);
-        const parentPlane = pluridEngine.space.tree.logic.getTreePlaneByID(stateTree, parentPlaneID);
+        const parentPlane = pluridEngine.space.tree.logic.getTreePlaneByID(stateTree, newParentPlaneID);
         assignTreePlaneToLink(parentPlane, linkCoordinates);
     }), []);
     React.useEffect((() => {
@@ -5948,7 +5957,6 @@ const PluridLink = properties => {
             }
         };
     }), [ preview, mouseOver ]);
-    React.useEffect((() => {}), []);
     React.useEffect((() => {
         const openClosedPlaneIndex = defaultPubSub.subscribe({
             topic: pluridData.PLURID_PUBSUB_TOPIC.OPEN_CLOSED_PLANE,
@@ -5987,17 +5995,12 @@ const PluridLink = properties => {
             defaultPubSub.unsubscribe(closePlaneIndex);
         };
     }), [ showLink, pluridPlaneID, JSON.stringify(stateTree) ]);
-    React.useEffect((() => {
-        const plane = pluridEngine.space.tree.logic.getTreePlaneByID(stateTree, pluridPlaneID);
-        planeRef.current = plane;
-        return () => {
-            setTimeout((() => {
-                var _a;
-                if (showLink && linkElement.current === null && ((_a = planeRef.current) === null || _a === void 0 ? void 0 : _a.show) === false) {
-                    removePlane();
-                }
-            }), 10);
-        };
+    React.useEffect((() => () => {
+        setTimeout((() => {
+            if (pluridPlaneID && showLink && linkElement.current === null) {
+                removePlane();
+            }
+        }), 10);
     }), [ showLink, showPreview, pluridPlaneID, parentPlaneID, JSON.stringify(stateTree) ]);
     return React__default["default"].createElement(StyledPluridLink, {
         ref: linkElement,
@@ -6036,7 +6039,8 @@ const mapDispatchToProperties$5 = dispatch => ({
     dispatch: dispatch,
     dispatchSetTree: payload => dispatch(actions.space.setTree(payload)),
     dispatchSetSpaceField: payload => dispatch(actions.space.setSpaceField(payload)),
-    dispatchUpdateSpaceLinkCoordinates: payload => dispatch(actions.space.updateSpaceLinkCoordinates(payload))
+    dispatchUpdateSpaceLinkCoordinates: payload => dispatch(actions.space.updateSpaceLinkCoordinates(payload)),
+    dispatchRemovePlane: payload => dispatch(actions.space.removePlane(payload))
 });
 
 const ConnectedPluridLink = reactRedux.connect(mapStateToProperties$5, mapDispatchToProperties$5, null, {