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

package/distribution/index.es.js

@@ -16,7 +16,7 @@ import { connect, Provider } from "react-redux";
 
 import { createSlice, combineReducers, configureStore } from "@reduxjs/toolkit";
 
-import { mathematics, dom, meta, objects, uuid, storage } from "@plurid/plurid-functions";
+import { mathematics, objects, dom, meta, uuid, storage } from "@plurid/plurid-functions";
 
 import themes$2, { plurid, decomposeColor } from "@plurid/plurid-themes";
 
@@ -42,9 +42,7 @@ const configuration = createSlice({
     name: "configuration",
     initialState: initialState$5,
     reducers: {
-        setConfiguration: (state, action) => {
-            state = Object.assign(Object.assign({}, state), action.payload);
-        },
+        setConfiguration: (_state, action) => Object.assign({}, action.payload),
         setConfigurationMicro: state => {
             state.elements.toolbar.show = false;
             state.elements.plane.controls.show = false;
@@ -168,11 +166,11 @@ const reducer$6 = configuration.reducer;
 
 var configuration$1 = Object.freeze({
     __proto__: null,
-    configuration: configuration,
     actions: actions$6,
+    configuration: configuration,
     getConfiguration: getConfiguration,
-    selectors: selectors$6,
-    reducer: reducer$6
+    reducer: reducer$6,
+    selectors: selectors$6
 });
 
 const initialState$4 = {};
@@ -195,11 +193,11 @@ const reducer$5 = general.reducer;
 
 var general$1 = Object.freeze({
     __proto__: null,
-    general: general,
     actions: actions$5,
+    general: general,
     getGeneral: getGeneral,
-    selectors: selectors$5,
-    reducer: reducer$5
+    reducer: reducer$5,
+    selectors: selectors$5
 });
 
 const initialState$3 = {
@@ -228,11 +226,11 @@ const reducer$4 = shortcuts.reducer;
 
 var shortcuts$1 = Object.freeze({
     __proto__: null,
-    shortcuts: shortcuts,
     actions: actions$4,
     getGlobal: getGlobal,
+    reducer: reducer$4,
     selectors: selectors$4,
-    reducer: reducer$4
+    shortcuts: shortcuts
 });
 
 const {registerPlanes: registerPlanes, getRegisteredPlanes: getRegisteredPlanes, getPlanesRegistrar: getPlanesRegistrar, getPluridPlaneIDByData: getPluridPlaneIDByData$1, getRegisteredPlane: getRegisteredPlane, resolvePluridRoutePlaneData: resolvePluridRoutePlaneData, resolvePluridPlaneData: resolvePluridPlaneData, Registrar: PluridPlanesRegistrar} = planes;
@@ -319,27 +317,27 @@ const getLastClosedPlane = state => state.space.lastClosedPlane;
 
 var selectors$3 = Object.freeze({
     __proto__: null,
-    getSpace: getSpace,
+    getActivePlaneID: getActivePlaneID,
+    getActiveUniverseID: getActiveUniverseID,
+    getAnimatedTransform: getAnimatedTransform,
+    getCulledView: getCulledView,
+    getIsolatePlane: getIsolatePlane,
+    getLastClosedPlane: getLastClosedPlane,
     getLoading: getLoading,
     getResolvedLayout: getResolvedLayout,
-    getTransformMatrix: getTransformMatrix,
-    getAnimatedTransform: getAnimatedTransform,
-    getTransformTime: getTransformTime,
     getRotationX: getRotationX,
     getRotationY: getRotationY,
+    getScale: getScale,
+    getSpace: getSpace,
+    getTransform: getTransform,
+    getTransformMatrix: getTransformMatrix,
+    getTransformTime: getTransformTime,
     getTranslationX: getTranslationX,
     getTranslationY: getTranslationY,
     getTranslationZ: getTranslationZ,
-    getScale: getScale,
     getTree: getTree,
-    getTransform: getTransform,
-    getActiveUniverseID: getActiveUniverseID,
     getView: getView,
-    getViewSize: getViewSize,
-    getCulledView: getCulledView,
-    getActivePlaneID: getActivePlaneID,
-    getIsolatePlane: getIsolatePlane,
-    getLastClosedPlane: getLastClosedPlane
+    getViewSize: getViewSize
 });
 
 const {toRadians: toRadians} = mathematics.geometry;
@@ -602,6 +600,10 @@ const space = createSlice({
         },
         spaceSetCulledView: (state, action) => {
             state.culledView = action.payload;
+        },
+        removePlane: (state, action) => {
+            const updatedTree = space$2.tree.logic.removePlaneFromTree(objects.clone(state.tree), action.payload);
+            state.tree = updatedTree;
         }
     }
 });
@@ -612,11 +614,11 @@ const reducer$3 = space.reducer;
 
 var space$1 = Object.freeze({
     __proto__: null,
-    name: name,
-    space: space,
     actions: actions$3,
+    name: name,
+    reducer: reducer$3,
     selectors: selectors$3,
-    reducer: reducer$3
+    space: space
 });
 
 const initialState$1 = {
@@ -652,12 +654,12 @@ const reducer$2 = themes.reducer;
 
 var themes$1 = Object.freeze({
     __proto__: null,
-    themes: themes,
     actions: actions$2,
     getGeneralTheme: getGeneralTheme,
     getInteractionTheme: getInteractionTheme,
+    reducer: reducer$2,
     selectors: selectors$2,
-    reducer: reducer$2
+    themes: themes
 });
 
 const initialState = {
@@ -686,11 +688,11 @@ const reducer$1 = ui.reducer;
 
 var ui$1 = Object.freeze({
     __proto__: null,
-    ui: ui,
     actions: actions$1,
     getToolbarScrollPosition: getToolbarScrollPosition,
+    reducer: reducer$1,
     selectors: selectors$1,
-    reducer: reducer$1
+    ui: ui
 });
 
 var modules = {
@@ -4346,7 +4348,7 @@ const PluridView = properties => {
         dispatchSetTree(computedTree);
     };
     const treeUpdateCallback = useCallback((() => {
-        treeUpdate(stateSpaceView, stateConfiguration);
+        treeUpdate(stateSpaceView, stateConfiguration, true);
     }), [ hostname, stateSpaceView, stateConfiguration, JSON.stringify(stateTree) ]);
     const handlePubSubSubscribe = pubsub => {
         const subscriptions = [ {
@@ -4450,14 +4452,14 @@ const PluridView = properties => {
                 const {plane: plane} = data;
                 const updatedView = [ ...stateSpaceView, plane ];
                 dispatchSpaceSetView(updatedView);
-                treeUpdate(updatedView);
+                treeUpdate(updatedView, undefined, true);
             }
         }, {
             topic: PLURID_PUBSUB_TOPIC.VIEW_SET_PLANES,
             callback: data => {
                 const {view: view} = data;
                 dispatchSpaceSetView([ ...view ]);
-                treeUpdate(view);
+                treeUpdate(view, undefined, true);
             }
         }, {
             topic: PLURID_PUBSUB_TOPIC.VIEW_REMOVE_PLANE,
@@ -4757,7 +4759,7 @@ const PluridView = properties => {
         return () => {
             window.removeEventListener("resize", treeUpdateCallback);
         };
-    }), [ stateSpaceView, stateConfiguration, JSON.stringify(stateTree) ]);
+    }), [ stateSpaceView, JSON.stringify(stateConfiguration), JSON.stringify(stateTree) ]);
     useEffect((() => {
         if (typeof window === "undefined") {
             return;
@@ -4838,12 +4840,12 @@ const PluridView = properties => {
                 unsubscriber();
             }
         };
-    }), [ state.space.lastClosedPlane, pluridPubSub.length, JSON.stringify(stateTree) ]);
+    }), [ state.space.lastClosedPlane, pluridPubSub.length, JSON.stringify(stateTree), JSON.stringify(stateConfiguration) ]);
     useEffect((() => {
         for (const pubsub of pluridPubSub) {
             handlePubSubPublish(pubsub);
         }
-    }), [ pluridPubSub.length, stateConfiguration, stateTransform ]);
+    }), [ pluridPubSub.length, JSON.stringify(stateConfiguration), stateTransform ]);
     useEffect((() => {
         treeUpdateCallback();
     }), []);
@@ -5695,7 +5697,7 @@ const PluridLink = properties => {
     if (!planesRegistry) {
         return React.createElement(React.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 || PLURID_DEFAULT_CONFIGURATION_LINK_PREVIEW_FADE_IN;
     const previewDisappearTime = previewFadeOut || PLURID_DEFAULT_CONFIGURATION_LINK_PREVIEW_FADE_OUT;
@@ -5706,7 +5708,6 @@ const PluridLink = properties => {
     const linkElement = useRef(null);
     const hoverInTimeout = useRef(null);
     const hoverOutTimeout = useRef(null);
-    const planeRef = useRef();
     const [mouseOver, setMouseOver] = useState(false);
     const [showPreview, setShowPreview] = useState(false);
     const [showLink, setShowLink] = useState(false);
@@ -5784,6 +5785,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);
             }
@@ -5849,9 +5853,12 @@ const PluridLink = properties => {
         }
     };
     const removePlane = () => {
-        const updatedTree = space$2.tree.logic.removePlaneFromTree(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 = useCallback((event => {
@@ -5871,11 +5878,11 @@ const PluridLink = properties => {
         return;
     };
     useEffect((() => {
-        const parentPlaneID = getPluridPlaneIDByData$1(linkElement.current);
-        setParentPlaneID(parentPlaneID);
+        const newParentPlaneID = getPluridPlaneIDByData$1(linkElement.current);
+        setParentPlaneID(newParentPlaneID);
         const linkCoordinates = getPluridLinkCoordinates();
         setLinkCoordinates(linkCoordinates);
-        const parentPlane = space$2.tree.logic.getTreePlaneByID(stateTree, parentPlaneID);
+        const parentPlane = space$2.tree.logic.getTreePlaneByID(stateTree, newParentPlaneID);
         assignTreePlaneToLink(parentPlane, linkCoordinates);
     }), []);
     useEffect((() => {
@@ -5910,7 +5917,6 @@ const PluridLink = properties => {
             }
         };
     }), [ preview, mouseOver ]);
-    useEffect((() => {}), []);
     useEffect((() => {
         const openClosedPlaneIndex = defaultPubSub.subscribe({
             topic: PLURID_PUBSUB_TOPIC.OPEN_CLOSED_PLANE,
@@ -5949,17 +5955,12 @@ const PluridLink = properties => {
             defaultPubSub.unsubscribe(closePlaneIndex);
         };
     }), [ showLink, pluridPlaneID, JSON.stringify(stateTree) ]);
-    useEffect((() => {
-        const plane = space$2.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);
-        };
+    useEffect((() => () => {
+        setTimeout((() => {
+            if (pluridPlaneID && showLink && linkElement.current === null) {
+                removePlane();
+            }
+        }), 10);
     }), [ showLink, showPreview, pluridPlaneID, parentPlaneID, JSON.stringify(stateTree) ]);
     return React.createElement(StyledPluridLink, {
         ref: linkElement,
@@ -5998,7 +5999,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 = connect(mapStateToProperties$5, mapDispatchToProperties$5, null, {