@plurid/plurid-react 0.0.0-18 → 0.0.0-20

package/distribution/index.js

@@ -5028,7 +5028,7 @@ const handleView = view => {
 const {getRegisteredPlanes: getRegisteredPlanes} = pluridEngine.planes;
 
 const PluridView = properties => {
-    const {planesRegistrar: planesRegistrar, customPlane: customPlane, planeContext: planeContext, planeContextValue: planeContextValue, pubsub: pubsub, planeNotFound: planeNotFound, planeRenderError: planeRenderError, matchedRoute: matchedRoute, stateConfiguration: stateConfiguration, stateTransform: stateTransform, stateSpaceView: stateSpaceView, dispatch: dispatch, dispatchSetConfiguration: dispatchSetConfiguration, dispatchSetGeneralTheme: dispatchSetGeneralTheme, dispatchSetInteractionTheme: dispatchSetInteractionTheme, dispatchSetSpaceLocation: dispatchSetSpaceLocation, dispatchSetAnimatedTransform: dispatchSetAnimatedTransform, dispatchSetTransformTime: dispatchSetTransformTime, dispatchSetTree: dispatchSetTree, dispatchRotateXWith: dispatchRotateXWith, dispatchRotateX: dispatchRotateX, dispatchRotateYWith: dispatchRotateYWith, dispatchRotateY: dispatchRotateY, dispatchTranslateXWith: dispatchTranslateXWith, dispatchTranslateYWith: dispatchTranslateYWith, dispatchScaleUpWith: dispatchScaleUpWith, dispatchScaleDownWith: dispatchScaleDownWith, dispatchSpaceSetViewSize: dispatchSpaceSetViewSize, dispatchSpaceSetView: dispatchSpaceSetView} = properties;
+    const {planesRegistrar: planesRegistrar, customPlane: customPlane, planeContext: planeContext, planeContextValue: planeContextValue, pubsub: pubsub, planeNotFound: planeNotFound, planeRenderError: planeRenderError, matchedRoute: matchedRoute, stateConfiguration: stateConfiguration, stateTransform: stateTransform, stateSpaceView: stateSpaceView, stateTree: stateTree, dispatch: dispatch, dispatchSetConfiguration: dispatchSetConfiguration, dispatchSetGeneralTheme: dispatchSetGeneralTheme, dispatchSetInteractionTheme: dispatchSetInteractionTheme, dispatchSetSpaceLocation: dispatchSetSpaceLocation, dispatchSetAnimatedTransform: dispatchSetAnimatedTransform, dispatchSetTransformTime: dispatchSetTransformTime, dispatchSetTree: dispatchSetTree, dispatchRotateXWith: dispatchRotateXWith, dispatchRotateX: dispatchRotateX, dispatchRotateYWith: dispatchRotateYWith, dispatchRotateY: dispatchRotateY, dispatchTranslateXWith: dispatchTranslateXWith, dispatchTranslateYWith: dispatchTranslateYWith, dispatchScaleUpWith: dispatchScaleUpWith, dispatchScaleDownWith: dispatchScaleDownWith, dispatchSpaceSetViewSize: dispatchSpaceSetViewSize, dispatchSpaceSetView: dispatchSpaceSetView} = properties;
     const viewElement = React.useRef(null);
     const [pluridPubSub, setPluridPubSub] = React.useState(pubsub ? [ pubsub ] : []);
     const shortcutsCallback = React.useCallback((event => {
@@ -5044,15 +5044,27 @@ const PluridView = properties => {
         };
         handleGlobalWheel(dispatch, event, transformModes, transformLocks);
     }), [ dispatch, stateConfiguration.space.transformMode, stateConfiguration.space.transformLocks ]);
-    const treeUpdateCallback = React.useCallback((() => {
+    const treeUpdate = (view, configuration = stateConfiguration) => {
         const planes = getRegisteredPlanes(planesRegistrar);
         const spaceTree = new pluridEngine.space.tree.Tree({
             planes: planes,
-            configuration: stateConfiguration,
-            view: stateSpaceView
+            configuration: configuration,
+            view: view
         });
         const computedTree = spaceTree.compute();
+        for (const statePlane of stateTree) {
+            for (const [index, computedPlane] of computedTree.entries()) {
+                if (statePlane.route === computedPlane.route) {
+                    if (statePlane.children) {
+                        computedTree[index].children = statePlane.children;
+                    }
+                }
+            }
+        }
         dispatchSetTree(computedTree);
+    };
+    const treeUpdateCallback = React.useCallback((() => {
+        treeUpdate(stateSpaceView);
     }), [ stateSpaceView, stateConfiguration ]);
     const handlePubSubSubscribe = pubsub => {
         const configurationIndex = pubsub.subscribe({
@@ -5150,6 +5162,7 @@ const PluridView = properties => {
                 const {plane: plane} = data;
                 const updatedView = [ ...stateSpaceView, plane ];
                 dispatchSpaceSetView(updatedView);
+                treeUpdate(updatedView);
             }
         });
         const viewSetPlanesIndex = pubsub.subscribe({
@@ -5157,6 +5170,7 @@ const PluridView = properties => {
             callback: data => {
                 const {view: view} = data;
                 dispatchSpaceSetView([ ...view ]);
+                treeUpdate(view);
             }
         });
         const viewRemovePlaneIndex = pubsub.subscribe({
@@ -5170,6 +5184,7 @@ const PluridView = properties => {
                     return true;
                 }));
                 dispatchSpaceSetView(updatedView);
+                treeUpdate(updatedView);
             }
         });
         return () => {
@@ -5209,10 +5224,10 @@ const PluridView = properties => {
     };
     const handleSwipe = event => {
         const {transformMode: transformMode} = stateConfiguration.space;
-        const {velocity: velocity, distance: distance, direction: direction} = event;
         if (transformMode === pluridData.TRANSFORM_MODES.ALL) {
             return;
         }
+        const {velocity: velocity, distance: distance, direction: direction} = event;
         const rotationMode = transformMode === pluridData.TRANSFORM_MODES.ROTATION;
         const translationMode = transformMode === pluridData.TRANSFORM_MODES.TRANSLATION;
         const scalationMode = transformMode === pluridData.TRANSFORM_MODES.SCALE;
@@ -5266,10 +5281,10 @@ const PluridView = properties => {
     };
     const handlePan = event => {
         const {transformMode: transformMode} = stateConfiguration.space;
-        const {velocity: velocity, distance: distance, direction: direction} = event;
         if (transformMode === pluridData.TRANSFORM_MODES.ALL) {
             return;
         }
+        const {velocity: velocity, distance: distance, direction: direction} = event;
         const rotationMode = transformMode === pluridData.TRANSFORM_MODES.ROTATION;
         const translationMode = transformMode === pluridData.TRANSFORM_MODES.TRANSLATION;
         const scalationMode = transformMode === pluridData.TRANSFORM_MODES.SCALE;
@@ -5390,18 +5405,17 @@ const PluridView = properties => {
         }));
         handleTouch();
         return () => {
+            if (!touch) {
+                return;
+            }
             const {transformTouch: transformTouch} = stateConfiguration.space;
             if (transformTouch === pluridData.TRANSFORM_TOUCHES.PAN) {
-                if (touch) {
-                    touch.off("pan", handlePan);
-                }
+                touch.off("pan", handlePan);
             } else {
-                if (touch) {
-                    touch.off("swipe", handleSwipe);
-                }
+                touch.off("swipe", handleSwipe);
             }
         };
-    }), [ viewElement.current, stateConfiguration.space.transformTouch ]);
+    }), [ viewElement.current, stateConfiguration.space.transformTouch, stateConfiguration.space.transformMode ]);
     React.useEffect((() => {
         const handleGamepadConnect = event => {
             const gamepad = navigator.getGamepads()[event.gamepad.index];
@@ -5463,6 +5477,7 @@ const PluridView = properties => {
 const mapStateToProperties$7 = state => ({
     stateConfiguration: selectors.configuration.getConfiguration(state),
     stateTransform: selectors.space.getTransform(state),
+    stateTree: selectors.space.getTree(state),
     stateSpaceLoading: selectors.space.getLoading(state),
     stateSpaceView: selectors.space.getView(state)
 });
@@ -5663,13 +5678,23 @@ const computeIndexedPlanes = (routes, protocol, host) => {
     return indexedPlanes;
 };
 
-const collectApplicationsFromPath = (isoMatch, protocol, host) => {
+const collectApplicationsFromPath = (isoMatch, protocol, host, globals) => __awaiter(void 0, void 0, void 0, (function*() {
     const path = {
-        planes: isoMatch.data.planes || [],
-        spaces: isoMatch.data.spaces || [],
-        view: isoMatch.data.view || [],
-        value: isoMatch.data.value || ""
+        planes: [],
+        spaces: [],
+        view: [],
+        value: ""
     };
+    if (isoMatch.kind === "Route") {
+        let routeData = isoMatch.data;
+        if (isoMatch.data.resolver) {
+            routeData = yield isoMatch.data.resolver(globals);
+        }
+        path.planes = routeData.planes || [];
+        path.spaces = routeData.spaces || [];
+        path.view = routeData.view || [];
+        path.value = isoMatch.data.value || "";
+    }
     const {planes: planes, spaces: spaces, view: view} = path;
     const plurids = [];
     if (spaces) {
@@ -5730,7 +5755,7 @@ const collectApplicationsFromPath = (isoMatch, protocol, host) => {
         plurids.push(pluridApplication);
     }
     return plurids;
-};
+}));
 
 const gatherPluridPlanes = (routes, planes) => {
     const pluridPlanes = [];
@@ -5947,7 +5972,10 @@ const computePluridRoute = (matchedRoute, planesRegistrar, isoMatcher, directPla
         }
         return () => () => React__default["default"].createElement(React__default["default"].Fragment, null);
     }
-    const {exterior: exterior, view: view, planes: planes, spaces: spaces, defaultConfiguration: defaultConfiguration, slotted: slotted} = matchedRoute.data;
+    const {exterior: exterior, view: view, planes: planes, spaces: spaces, defaultConfiguration: defaultConfiguration, slotted: slotted, resolver: resolver} = matchedRoute.data;
+    if (resolver) {
+        resolver(undefined);
+    }
     const pluridRouteProperty = {
         value: matchedRoute.match.value,
         parameters: matchedRoute.match.parameters,
@@ -6408,7 +6436,7 @@ const PluridLink = properties => {
         if (showLink) {
             return;
         }
-        if (event.ctrlKey || event.metaKey) {
+        if (event.altKey || event.metaKey) {
             return;
         }
         const {location: location} = updatedPlane;
@@ -6946,11 +6974,11 @@ const computeApplication = (indexedPlanes, planes, configuration, view) => {
     return data;
 };
 
-const serverComputeMetastate = (isoMatch, paths) => {
+const serverComputeMetastate = (isoMatch, paths, globals) => __awaiter(void 0, void 0, void 0, (function*() {
     const protocol = "http";
     const host = "localhost:63000";
     const indexedPlanes = computeIndexedPlanes(paths, protocol, host);
-    const pluridApplications = collectApplicationsFromPath(isoMatch);
+    const pluridApplications = yield collectApplicationsFromPath(isoMatch, protocol, host, globals);
     const states = {};
     for (const application of pluridApplications) {
         const {planes: planes, view: view} = application;
@@ -7008,13 +7036,13 @@ const serverComputeMetastate = (isoMatch, paths) => {
     return {
         states: states
     };
-};
+}));
 
 const usePluridRouter = () => {
     const [routerValue, setRouterValue] = React.useState("");
     React.useEffect((() => {
         const fetchState = () => {
-            const state = pluridFunctions.storage.loadState("__PLURID_ROUTER__");
+            const state = pluridFunctions.storage.loadState(pluridData.PLURID_ROUTER_STORAGE);
             if (state) {
                 setRouterValue(state);
             }