@dxos/plugin-deck 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/add-toast-QUWRKFDD.mjs +24 -0
- package/dist/lib/browser/add-toast-QUWRKFDD.mjs.map +7 -0
- package/dist/lib/browser/adjust-J6F24WWJ.mjs +96 -0
- package/dist/lib/browser/adjust-J6F24WWJ.mjs.map +7 -0
- package/dist/lib/browser/change-companion-EZI57WDZ.mjs +34 -0
- package/dist/lib/browser/change-companion-EZI57WDZ.mjs.map +7 -0
- package/dist/lib/browser/chunk-2YNVGCOQ.mjs +88 -0
- package/dist/lib/browser/chunk-2YNVGCOQ.mjs.map +7 -0
- package/dist/lib/browser/chunk-AYFQHPPP.mjs +69 -0
- package/dist/lib/browser/chunk-AYFQHPPP.mjs.map +7 -0
- package/dist/lib/browser/chunk-GCDWE37Y.mjs +220 -0
- package/dist/lib/browser/chunk-GCDWE37Y.mjs.map +7 -0
- package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
- package/dist/lib/browser/chunk-J5LGTIGS.mjs.map +7 -0
- package/dist/lib/browser/chunk-KUTDCWZF.mjs +30 -0
- package/dist/lib/browser/chunk-KUTDCWZF.mjs.map +7 -0
- package/dist/lib/browser/chunk-OHKLENIG.mjs +45 -0
- package/dist/lib/browser/chunk-OHKLENIG.mjs.map +7 -0
- package/dist/lib/browser/close-6RB62DEY.mjs +44 -0
- package/dist/lib/browser/close-6RB62DEY.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +161 -126
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/open-YL3JKXGK.mjs +115 -0
- package/dist/lib/browser/open-YL3JKXGK.mjs.map +7 -0
- package/dist/lib/browser/operations/index.mjs +13 -0
- package/dist/lib/browser/operations/index.mjs.map +7 -0
- package/dist/lib/browser/revert-workspace-JC66YMWB.mjs +21 -0
- package/dist/lib/browser/revert-workspace-JC66YMWB.mjs.map +7 -0
- package/dist/lib/browser/scroll-into-view-QSSFZ3KD.mjs +21 -0
- package/dist/lib/browser/scroll-into-view-QSSFZ3KD.mjs.map +7 -0
- package/dist/lib/browser/set-LPAGXY3F.mjs +37 -0
- package/dist/lib/browser/set-LPAGXY3F.mjs.map +7 -0
- package/dist/lib/browser/set-layout-mode-XZ4VHS2X.mjs +90 -0
- package/dist/lib/browser/set-layout-mode-XZ4VHS2X.mjs.map +7 -0
- package/dist/lib/browser/show-undo-IWX4S777.mjs +59 -0
- package/dist/lib/browser/show-undo-IWX4S777.mjs.map +7 -0
- package/dist/lib/browser/switch-workspace-5RKQ2LVK.mjs +68 -0
- package/dist/lib/browser/switch-workspace-5RKQ2LVK.mjs.map +7 -0
- package/dist/lib/browser/types/index.mjs +8 -15
- package/dist/lib/browser/update-complementary-QIIZWLGY.mjs +28 -0
- package/dist/lib/browser/update-complementary-QIIZWLGY.mjs.map +7 -0
- package/dist/lib/browser/update-dialog-5IKCWFPW.mjs +29 -0
- package/dist/lib/browser/update-dialog-5IKCWFPW.mjs.map +7 -0
- package/dist/lib/browser/update-plank-size-YDM67P65.mjs +28 -0
- package/dist/lib/browser/update-plank-size-YDM67P65.mjs.map +7 -0
- package/dist/lib/browser/update-popover-AUVAWH3D.mjs +33 -0
- package/dist/lib/browser/update-popover-AUVAWH3D.mjs.map +7 -0
- package/dist/lib/browser/update-sidebar-BT3L5GJN.mjs +25 -0
- package/dist/lib/browser/update-sidebar-BT3L5GJN.mjs.map +7 -0
- package/dist/lib/node-esm/add-toast-MR53ZMTS.mjs +25 -0
- package/dist/lib/node-esm/add-toast-MR53ZMTS.mjs.map +7 -0
- package/dist/lib/node-esm/adjust-IXRBIVAO.mjs +97 -0
- package/dist/lib/node-esm/adjust-IXRBIVAO.mjs.map +7 -0
- package/dist/lib/node-esm/change-companion-RLMI5EYL.mjs +35 -0
- package/dist/lib/node-esm/change-companion-RLMI5EYL.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-7BNWWWAF.mjs +221 -0
- package/dist/lib/node-esm/chunk-7BNWWWAF.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-C2AWKR2S.mjs +71 -0
- package/dist/lib/node-esm/chunk-C2AWKR2S.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-GI5JXNBT.mjs +89 -0
- package/dist/lib/node-esm/chunk-GI5JXNBT.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +11 -0
- package/dist/lib/node-esm/chunk-HSLMI22Q.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-MLVJ2ODW.mjs +32 -0
- package/dist/lib/node-esm/chunk-MLVJ2ODW.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-TFFZ7NWH.mjs +47 -0
- package/dist/lib/node-esm/chunk-TFFZ7NWH.mjs.map +7 -0
- package/dist/lib/node-esm/close-UD7KBYZP.mjs +45 -0
- package/dist/lib/node-esm/close-UD7KBYZP.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +161 -126
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/open-XZ7YGVPZ.mjs +116 -0
- package/dist/lib/node-esm/open-XZ7YGVPZ.mjs.map +7 -0
- package/dist/lib/node-esm/operations/index.mjs +14 -0
- package/dist/lib/node-esm/operations/index.mjs.map +7 -0
- package/dist/lib/node-esm/revert-workspace-F3FUP4ZL.mjs +22 -0
- package/dist/lib/node-esm/revert-workspace-F3FUP4ZL.mjs.map +7 -0
- package/dist/lib/node-esm/scroll-into-view-24TF2WYQ.mjs +22 -0
- package/dist/lib/node-esm/scroll-into-view-24TF2WYQ.mjs.map +7 -0
- package/dist/lib/node-esm/set-F2QWLSJR.mjs +38 -0
- package/dist/lib/node-esm/set-F2QWLSJR.mjs.map +7 -0
- package/dist/lib/node-esm/set-layout-mode-Z54OX33H.mjs +91 -0
- package/dist/lib/node-esm/set-layout-mode-Z54OX33H.mjs.map +7 -0
- package/dist/lib/node-esm/show-undo-B2XVCKGX.mjs +60 -0
- package/dist/lib/node-esm/show-undo-B2XVCKGX.mjs.map +7 -0
- package/dist/lib/node-esm/switch-workspace-PM57REEV.mjs +69 -0
- package/dist/lib/node-esm/switch-workspace-PM57REEV.mjs.map +7 -0
- package/dist/lib/node-esm/types/index.mjs +8 -15
- package/dist/lib/node-esm/update-complementary-26H5UYJP.mjs +29 -0
- package/dist/lib/node-esm/update-complementary-26H5UYJP.mjs.map +7 -0
- package/dist/lib/node-esm/update-dialog-EYP3QNFG.mjs +30 -0
- package/dist/lib/node-esm/update-dialog-EYP3QNFG.mjs.map +7 -0
- package/dist/lib/node-esm/update-plank-size-LLFUB57G.mjs +29 -0
- package/dist/lib/node-esm/update-plank-size-LLFUB57G.mjs.map +7 -0
- package/dist/lib/node-esm/update-popover-G55PS7T4.mjs +34 -0
- package/dist/lib/node-esm/update-popover-G55PS7T4.mjs.map +7 -0
- package/dist/lib/node-esm/update-sidebar-W4ND5MUL.mjs +26 -0
- package/dist/lib/node-esm/update-sidebar-W4ND5MUL.mjs.map +7 -0
- package/dist/types/src/DeckPlugin.d.ts.map +1 -1
- package/dist/types/src/capabilities/app-graph-builder.d.ts +6 -0
- package/dist/types/src/capabilities/app-graph-builder.d.ts.map +1 -0
- package/dist/types/src/capabilities/check-app-scheme.d.ts +19 -0
- package/dist/types/src/capabilities/check-app-scheme.d.ts.map +1 -0
- package/dist/types/src/capabilities/index.d.ts +198 -9
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/operation-handler.d.ts +6 -0
- package/dist/types/src/capabilities/operation-handler.d.ts.map +1 -0
- package/dist/types/src/capabilities/{react-root/react-root.d.ts → react-root.d.ts} +1 -1
- package/dist/types/src/capabilities/react-root.d.ts.map +1 -0
- package/dist/types/src/capabilities/react-surface.d.ts +5 -0
- package/dist/types/src/capabilities/react-surface.d.ts.map +1 -0
- package/dist/types/src/capabilities/{settings/settings.d.ts → settings.d.ts} +4 -3
- package/dist/types/src/capabilities/settings.d.ts.map +1 -0
- package/dist/types/src/capabilities/{state/state.d.ts → state.d.ts} +11 -11
- package/dist/types/src/capabilities/state.d.ts.map +1 -0
- package/dist/types/src/capabilities/{tools/tools.d.ts → tools.d.ts} +2 -2
- package/dist/types/src/capabilities/tools.d.ts.map +1 -0
- package/dist/types/src/capabilities/url-handler.d.ts +5 -0
- package/dist/types/src/capabilities/url-handler.d.ts.map +1 -0
- package/dist/types/src/components/DeckSettings/DeckSettings.d.ts +4 -6
- package/dist/types/src/components/DeckSettings/DeckSettings.d.ts.map +1 -1
- package/dist/types/src/components/DeckSettings/DeckSettings.stories.d.ts +85 -0
- package/dist/types/src/components/DeckSettings/DeckSettings.stories.d.ts.map +1 -0
- package/dist/types/src/components/DeckSettings/index.d.ts +2 -1
- package/dist/types/src/components/DeckSettings/index.d.ts.map +1 -1
- package/dist/types/src/components/Matrix/Matrix.d.ts +49 -0
- package/dist/types/src/components/Matrix/Matrix.d.ts.map +1 -0
- package/dist/types/src/components/Matrix/Matrix.stories.d.ts +17 -0
- package/dist/types/src/components/Matrix/Matrix.stories.d.ts.map +1 -0
- package/dist/types/src/components/Matrix/index.d.ts +3 -0
- package/dist/types/src/components/Matrix/index.d.ts.map +1 -0
- package/dist/types/src/components/index.d.ts +3 -2
- package/dist/types/src/components/index.d.ts.map +1 -1
- package/dist/types/src/containers/Deck/Banner.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/Deck.d.ts +25 -0
- package/dist/types/src/containers/Deck/Deck.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/Deck.stories.d.ts +85 -0
- package/dist/types/src/containers/Deck/Deck.stories.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/DeckContent.d.ts +7 -0
- package/dist/types/src/containers/Deck/DeckContent.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/DeckRoot.d.ts +42 -0
- package/dist/types/src/containers/Deck/DeckRoot.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/DeckViewport.d.ts +19 -0
- package/dist/types/src/containers/Deck/DeckViewport.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/StatusBar.d.ts.map +1 -0
- package/dist/types/src/containers/Deck/index.d.ts +2 -0
- package/dist/types/src/containers/Deck/index.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/ActiveNode.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/DeckLayout.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/DeckLayout.stories.d.ts +87 -0
- package/dist/types/src/containers/DeckLayout/DeckLayout.stories.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/DeckLayout/Dialog.d.ts.map +1 -1
- package/dist/types/src/containers/DeckLayout/Fallback.d.ts +2 -0
- package/dist/types/src/containers/DeckLayout/Fallback.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/Popover.d.ts +5 -0
- package/dist/types/src/containers/DeckLayout/Popover.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/DeckLayout/Toast.d.ts +3 -3
- package/dist/types/src/containers/DeckLayout/Toast.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/constants.d.ts.map +1 -0
- package/dist/types/src/containers/DeckLayout/index.d.ts +4 -0
- package/dist/types/src/containers/DeckLayout/index.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/Plank.d.ts +21 -0
- package/dist/types/src/containers/Plank/Plank.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/Plank.stories.d.ts +84 -0
- package/dist/types/src/containers/Plank/Plank.stories.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/PlankComponent.d.ts +15 -0
- package/dist/types/src/containers/Plank/PlankComponent.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/PlankContent.d.ts +14 -0
- package/dist/types/src/containers/Plank/PlankContent.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/Plank/PlankControls.d.ts +5 -6
- package/dist/types/src/containers/Plank/PlankControls.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/PlankError.d.ts +15 -0
- package/dist/types/src/containers/Plank/PlankError.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/Plank/PlankHeading.d.ts +1 -1
- package/dist/types/src/containers/Plank/PlankHeading.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/Plank/PlankLoading.d.ts.map +1 -1
- package/dist/types/src/containers/Plank/PlankRoot.d.ts +37 -0
- package/dist/types/src/containers/Plank/PlankRoot.d.ts.map +1 -0
- package/dist/types/src/containers/Plank/index.d.ts +4 -0
- package/dist/types/src/containers/Plank/index.d.ts.map +1 -0
- package/dist/types/src/containers/Sidebar/ComplementarySidebar.d.ts.map +1 -0
- package/dist/types/src/{components → containers}/Sidebar/Sidebar.d.ts.map +1 -1
- package/dist/types/src/{components → containers}/Sidebar/SidebarButton.d.ts.map +1 -1
- package/dist/types/src/{components → containers}/Sidebar/index.d.ts.map +1 -1
- package/dist/types/src/containers/index.d.ts +6 -0
- package/dist/types/src/containers/index.d.ts.map +1 -0
- package/dist/types/src/hooks/index.d.ts +1 -0
- package/dist/types/src/hooks/index.d.ts.map +1 -1
- package/dist/types/src/hooks/useDeckCompanions.d.ts +0 -1
- package/dist/types/src/hooks/useDeckCompanions.d.ts.map +1 -1
- package/dist/types/src/hooks/useDeckState.d.ts +3 -3
- package/dist/types/src/hooks/useDeckState.d.ts.map +1 -1
- package/dist/types/src/hooks/useHoistStatusbar.d.ts +1 -1
- package/dist/types/src/hooks/useHoistStatusbar.d.ts.map +1 -1
- package/dist/types/src/hooks/useMainSize.d.ts +2 -2
- package/dist/types/src/hooks/useSelectedCompanion.d.ts +13 -0
- package/dist/types/src/hooks/useSelectedCompanion.d.ts.map +1 -0
- package/dist/types/src/layout.d.ts +3 -9
- package/dist/types/src/layout.d.ts.map +1 -1
- package/dist/types/src/operations/add-toast.d.ts +5 -0
- package/dist/types/src/operations/add-toast.d.ts.map +1 -0
- package/dist/types/src/operations/adjust.d.ts +5 -0
- package/dist/types/src/operations/adjust.d.ts.map +1 -0
- package/dist/types/src/operations/change-companion.d.ts +5 -0
- package/dist/types/src/operations/change-companion.d.ts.map +1 -0
- package/dist/types/src/operations/close.d.ts +5 -0
- package/dist/types/src/operations/close.d.ts.map +1 -0
- package/dist/types/src/operations/definitions.d.ts +18 -0
- package/dist/types/src/operations/definitions.d.ts.map +1 -0
- package/dist/types/src/operations/helpers.d.ts +3 -0
- package/dist/types/src/operations/helpers.d.ts.map +1 -0
- package/dist/types/src/operations/index.d.ts +4 -0
- package/dist/types/src/operations/index.d.ts.map +1 -0
- package/dist/types/src/operations/open.d.ts +5 -0
- package/dist/types/src/operations/open.d.ts.map +1 -0
- package/dist/types/src/operations/revert-workspace.d.ts +5 -0
- package/dist/types/src/operations/revert-workspace.d.ts.map +1 -0
- package/dist/types/src/operations/scroll-into-view.d.ts +5 -0
- package/dist/types/src/operations/scroll-into-view.d.ts.map +1 -0
- package/dist/types/src/operations/set-layout-mode.d.ts +9 -0
- package/dist/types/src/operations/set-layout-mode.d.ts.map +1 -0
- package/dist/types/src/operations/set.d.ts +5 -0
- package/dist/types/src/operations/set.d.ts.map +1 -0
- package/dist/types/src/operations/show-undo.d.ts +5 -0
- package/dist/types/src/operations/show-undo.d.ts.map +1 -0
- package/dist/types/src/operations/switch-workspace.d.ts +5 -0
- package/dist/types/src/operations/switch-workspace.d.ts.map +1 -0
- package/dist/types/src/operations/update-complementary.d.ts +5 -0
- package/dist/types/src/operations/update-complementary.d.ts.map +1 -0
- package/dist/types/src/operations/update-dialog.d.ts +5 -0
- package/dist/types/src/operations/update-dialog.d.ts.map +1 -0
- package/dist/types/src/operations/update-plank-size.d.ts +5 -0
- package/dist/types/src/operations/update-plank-size.d.ts.map +1 -0
- package/dist/types/src/operations/update-popover.d.ts +5 -0
- package/dist/types/src/operations/update-popover.d.ts.map +1 -0
- package/dist/types/src/operations/update-sidebar.d.ts +5 -0
- package/dist/types/src/operations/update-sidebar.d.ts.map +1 -0
- package/dist/types/src/testing/DeckLayoutStoryNavigation.d.ts +10 -0
- package/dist/types/src/testing/DeckLayoutStoryNavigation.d.ts.map +1 -0
- package/dist/types/src/testing/index.d.ts +2 -0
- package/dist/types/src/testing/index.d.ts.map +1 -0
- package/dist/types/src/translations.d.ts +66 -54
- package/dist/types/src/translations.d.ts.map +1 -1
- package/dist/types/src/types/Settings.d.ts +16 -0
- package/dist/types/src/types/Settings.d.ts.map +1 -0
- package/dist/types/src/types/capabilities.d.ts +11 -11
- package/dist/types/src/types/capabilities.d.ts.map +1 -1
- package/dist/types/src/types/events.d.ts.map +1 -1
- package/dist/types/src/types/index.d.ts +1 -0
- package/dist/types/src/types/index.d.ts.map +1 -1
- package/dist/types/src/types/schema.d.ts +38 -94
- package/dist/types/src/types/schema.d.ts.map +1 -1
- package/dist/types/src/util/index.d.ts +1 -0
- package/dist/types/src/util/index.d.ts.map +1 -1
- package/dist/types/src/util/layoutAppliesTopbar.d.ts +1 -1
- package/dist/types/src/util/layoutAppliesTopbar.d.ts.map +1 -1
- package/dist/types/src/util/sanitize-persisted-state.d.ts +19 -0
- package/dist/types/src/util/sanitize-persisted-state.d.ts.map +1 -0
- package/dist/types/src/util/sanitize-persisted-state.test.d.ts +2 -0
- package/dist/types/src/util/sanitize-persisted-state.test.d.ts.map +1 -0
- package/dist/types/src/util/set-active.d.ts +2 -2
- package/dist/types/src/util/set-active.d.ts.map +1 -1
- package/dist/types/src/util/set-active.test.d.ts +2 -0
- package/dist/types/src/util/set-active.test.d.ts.map +1 -0
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +77 -44
- package/src/DeckPlugin.ts +18 -22
- package/src/capabilities/app-graph-builder.ts +127 -0
- package/src/capabilities/check-app-scheme.ts +139 -0
- package/src/capabilities/index.ts +14 -10
- package/src/capabilities/operation-handler.ts +16 -0
- package/src/capabilities/{react-root/react-root.tsx → react-root.tsx} +5 -5
- package/src/capabilities/react-surface.tsx +38 -0
- package/src/capabilities/{settings/settings.ts → settings.ts} +8 -7
- package/src/capabilities/{state/state.ts → state.ts} +17 -31
- package/src/capabilities/{tools/tools.ts → tools.ts} +4 -5
- package/src/capabilities/url-handler.ts +209 -0
- package/src/components/DeckSettings/DeckSettings.stories.tsx +40 -0
- package/src/components/DeckSettings/DeckSettings.tsx +103 -93
- package/src/components/DeckSettings/index.ts +4 -2
- package/src/components/Matrix/Matrix.stories.tsx +213 -0
- package/src/components/Matrix/Matrix.tsx +205 -0
- package/src/components/Matrix/SPEC.md +219 -0
- package/src/components/Matrix/index.ts +6 -0
- package/src/components/index.ts +6 -3
- package/src/{components/DeckLayout → containers/Deck}/Banner.tsx +10 -9
- package/src/containers/Deck/Deck.stories.tsx +85 -0
- package/src/containers/Deck/Deck.tsx +21 -0
- package/src/containers/Deck/DeckContent.tsx +104 -0
- package/src/containers/Deck/DeckRoot.tsx +49 -0
- package/src/containers/Deck/DeckViewport.tsx +397 -0
- package/src/{components/DeckLayout → containers/Deck}/StatusBar.tsx +4 -4
- package/src/containers/Deck/index.ts +5 -0
- package/src/{components → containers}/DeckLayout/ActiveNode.tsx +4 -3
- package/src/containers/DeckLayout/DeckLayout.stories.tsx +174 -0
- package/src/containers/DeckLayout/DeckLayout.tsx +62 -0
- package/src/{components → containers}/DeckLayout/Dialog.tsx +11 -5
- package/src/containers/DeckLayout/Fallback.tsx +24 -0
- package/src/{components → containers}/DeckLayout/Popover.tsx +58 -18
- package/src/{components → containers}/DeckLayout/Toast.tsx +4 -4
- package/src/{components → containers}/DeckLayout/constants.ts +1 -0
- package/src/{components → containers}/DeckLayout/index.ts +3 -2
- package/src/containers/Plank/Plank.stories.tsx +105 -0
- package/src/containers/Plank/Plank.tsx +22 -0
- package/src/containers/Plank/PlankComponent.tsx +179 -0
- package/src/containers/Plank/PlankContent.tsx +45 -0
- package/src/{components → containers}/Plank/PlankControls.tsx +41 -34
- package/src/containers/Plank/PlankError.tsx +79 -0
- package/src/{components → containers}/Plank/PlankHeading.tsx +36 -45
- package/src/{components → containers}/Plank/PlankLoading.tsx +1 -1
- package/src/containers/Plank/PlankRoot.tsx +49 -0
- package/src/{components → containers}/Plank/index.ts +0 -2
- package/src/containers/Sidebar/ComplementarySidebar.tsx +209 -0
- package/src/{components → containers}/Sidebar/Sidebar.tsx +8 -8
- package/src/{components → containers}/Sidebar/SidebarButton.tsx +19 -19
- package/src/containers/index.ts +11 -0
- package/src/hooks/index.ts +1 -0
- package/src/hooks/useCompanions.ts +3 -3
- package/src/hooks/useDeckCompanions.ts +3 -8
- package/src/hooks/useDeckState.ts +14 -23
- package/src/hooks/useHoistStatusbar.ts +2 -2
- package/src/hooks/useMainSize.ts +2 -2
- package/src/hooks/useNodeActionExpander.ts +1 -1
- package/src/hooks/useSelectedCompanion.ts +32 -0
- package/src/layout.ts +3 -16
- package/src/meta.ts +1 -1
- package/src/operations/add-toast.ts +24 -0
- package/src/operations/adjust.ts +83 -0
- package/src/operations/change-companion.ts +35 -0
- package/src/operations/close.ts +35 -0
- package/src/operations/definitions.ts +61 -0
- package/src/operations/helpers.ts +22 -0
- package/src/operations/index.ts +26 -0
- package/src/operations/open.ts +117 -0
- package/src/operations/revert-workspace.ts +22 -0
- package/src/operations/scroll-into-view.ts +24 -0
- package/src/operations/set-layout-mode.ts +84 -0
- package/src/operations/set.ts +36 -0
- package/src/operations/show-undo.ts +46 -0
- package/src/operations/switch-workspace.ts +60 -0
- package/src/operations/update-complementary.ts +33 -0
- package/src/operations/update-dialog.ts +34 -0
- package/src/operations/update-plank-size.ts +29 -0
- package/src/operations/update-popover.ts +36 -0
- package/src/operations/update-sidebar.ts +28 -0
- package/src/testing/DeckLayoutStoryNavigation.tsx +57 -0
- package/src/testing/index.ts +5 -0
- package/src/translations.ts +67 -54
- package/src/types/Settings.ts +26 -0
- package/src/types/capabilities.ts +9 -8
- package/src/types/events.ts +6 -5
- package/src/types/index.ts +1 -0
- package/src/types/schema.ts +35 -110
- package/src/util/index.ts +1 -0
- package/src/util/layoutAppliesTopbar.ts +1 -1
- package/src/util/overscroll.ts +3 -3
- package/src/util/sanitize-persisted-state.test.ts +79 -0
- package/src/util/sanitize-persisted-state.ts +52 -0
- package/src/util/set-active.test.ts +106 -0
- package/src/util/set-active.ts +2 -2
- package/src/vite-env.d.ts +5 -0
- package/dist/lib/browser/app-graph-builder-DTVCULQ4.mjs +0 -120
- package/dist/lib/browser/app-graph-builder-DTVCULQ4.mjs.map +0 -7
- package/dist/lib/browser/check-app-scheme-JSRXXIYF.mjs +0 -32
- package/dist/lib/browser/check-app-scheme-JSRXXIYF.mjs.map +0 -7
- package/dist/lib/browser/chunk-ATFPDN6J.mjs +0 -292
- package/dist/lib/browser/chunk-ATFPDN6J.mjs.map +0 -7
- package/dist/lib/browser/chunk-NHABISX2.mjs +0 -152
- package/dist/lib/browser/chunk-NHABISX2.mjs.map +0 -7
- package/dist/lib/browser/chunk-S4A5UO4K.mjs +0 -1448
- package/dist/lib/browser/chunk-S4A5UO4K.mjs.map +0 -7
- package/dist/lib/browser/chunk-UNG4CLLP.mjs +0 -161
- package/dist/lib/browser/chunk-UNG4CLLP.mjs.map +0 -7
- package/dist/lib/browser/operation-resolver-CDYBLZJ4.mjs +0 -595
- package/dist/lib/browser/operation-resolver-CDYBLZJ4.mjs.map +0 -7
- package/dist/lib/browser/react-root-XDCMNENQ.mjs +0 -47
- package/dist/lib/browser/react-root-XDCMNENQ.mjs.map +0 -7
- package/dist/lib/browser/react-surface-HODERLOL.mjs +0 -42
- package/dist/lib/browser/react-surface-HODERLOL.mjs.map +0 -7
- package/dist/lib/browser/settings-OMHVGZ6V.mjs +0 -37
- package/dist/lib/browser/settings-OMHVGZ6V.mjs.map +0 -7
- package/dist/lib/browser/state-OC3BSB6E.mjs +0 -103
- package/dist/lib/browser/state-OC3BSB6E.mjs.map +0 -7
- package/dist/lib/browser/toolkit-R53LD3EA.mjs +0 -53
- package/dist/lib/browser/toolkit-R53LD3EA.mjs.map +0 -7
- package/dist/lib/browser/url-handler-53TE6JZO.mjs +0 -93
- package/dist/lib/browser/url-handler-53TE6JZO.mjs.map +0 -7
- package/dist/lib/node-esm/app-graph-builder-473BNZDJ.mjs +0 -121
- package/dist/lib/node-esm/app-graph-builder-473BNZDJ.mjs.map +0 -7
- package/dist/lib/node-esm/check-app-scheme-IVYRHKRH.mjs +0 -33
- package/dist/lib/node-esm/check-app-scheme-IVYRHKRH.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-ADPMWKLL.mjs +0 -154
- package/dist/lib/node-esm/chunk-ADPMWKLL.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-D34L3ECT.mjs +0 -1449
- package/dist/lib/node-esm/chunk-D34L3ECT.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-SKEVPQ7E.mjs +0 -162
- package/dist/lib/node-esm/chunk-SKEVPQ7E.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-XAKTY3EB.mjs +0 -294
- package/dist/lib/node-esm/chunk-XAKTY3EB.mjs.map +0 -7
- package/dist/lib/node-esm/operation-resolver-WUOE33ID.mjs +0 -596
- package/dist/lib/node-esm/operation-resolver-WUOE33ID.mjs.map +0 -7
- package/dist/lib/node-esm/react-root-O6GZO62Z.mjs +0 -48
- package/dist/lib/node-esm/react-root-O6GZO62Z.mjs.map +0 -7
- package/dist/lib/node-esm/react-surface-IHDJDGC5.mjs +0 -43
- package/dist/lib/node-esm/react-surface-IHDJDGC5.mjs.map +0 -7
- package/dist/lib/node-esm/settings-2HB6FKIK.mjs +0 -38
- package/dist/lib/node-esm/settings-2HB6FKIK.mjs.map +0 -7
- package/dist/lib/node-esm/state-JRQ45ACJ.mjs +0 -104
- package/dist/lib/node-esm/state-JRQ45ACJ.mjs.map +0 -7
- package/dist/lib/node-esm/toolkit-JLPZNNKB.mjs +0 -54
- package/dist/lib/node-esm/toolkit-JLPZNNKB.mjs.map +0 -7
- package/dist/lib/node-esm/url-handler-QGF2R24T.mjs +0 -94
- package/dist/lib/node-esm/url-handler-QGF2R24T.mjs.map +0 -7
- package/dist/types/src/capabilities/app-graph-builder/app-graph-builder.d.ts +0 -6
- package/dist/types/src/capabilities/app-graph-builder/app-graph-builder.d.ts.map +0 -1
- package/dist/types/src/capabilities/app-graph-builder/index.d.ts +0 -3
- package/dist/types/src/capabilities/app-graph-builder/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/check-app-scheme/check-app-scheme.d.ts +0 -5
- package/dist/types/src/capabilities/check-app-scheme/check-app-scheme.d.ts.map +0 -1
- package/dist/types/src/capabilities/check-app-scheme/index.d.ts +0 -3
- package/dist/types/src/capabilities/check-app-scheme/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/operation-resolver/index.d.ts +0 -3
- package/dist/types/src/capabilities/operation-resolver/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts +0 -5
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-root/index.d.ts +0 -6
- package/dist/types/src/capabilities/react-root/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-root/react-root.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-surface/index.d.ts +0 -3
- package/dist/types/src/capabilities/react-surface/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts +0 -5
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +0 -1
- package/dist/types/src/capabilities/settings/index.d.ts +0 -19
- package/dist/types/src/capabilities/settings/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/settings/settings.d.ts.map +0 -1
- package/dist/types/src/capabilities/state/index.d.ts +0 -172
- package/dist/types/src/capabilities/state/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/state/state.d.ts.map +0 -1
- package/dist/types/src/capabilities/toolkit/index.d.ts +0 -3
- package/dist/types/src/capabilities/toolkit/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/toolkit/toolkit.d.ts +0 -26
- package/dist/types/src/capabilities/toolkit/toolkit.d.ts.map +0 -1
- package/dist/types/src/capabilities/tools/index.d.ts +0 -3
- package/dist/types/src/capabilities/tools/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/tools/tools.d.ts.map +0 -1
- package/dist/types/src/capabilities/url-handler/index.d.ts +0 -3
- package/dist/types/src/capabilities/url-handler/index.d.ts.map +0 -1
- package/dist/types/src/capabilities/url-handler/url-handler.d.ts +0 -5
- package/dist/types/src/capabilities/url-handler/url-handler.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/ActiveNode.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/Banner.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/ContentEmpty.d.ts +0 -3
- package/dist/types/src/components/DeckLayout/ContentEmpty.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/DeckLayout.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts +0 -74
- package/dist/types/src/components/DeckLayout/DeckLayout.stories.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/DeckMain.d.ts +0 -3
- package/dist/types/src/components/DeckLayout/DeckMain.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/Fallback.d.ts +0 -3
- package/dist/types/src/components/DeckLayout/Fallback.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/Popover.d.ts +0 -5
- package/dist/types/src/components/DeckLayout/Popover.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/StatusBar.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/Toast.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/Topbar.d.ts +0 -3
- package/dist/types/src/components/DeckLayout/Topbar.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/constants.d.ts.map +0 -1
- package/dist/types/src/components/DeckLayout/index.d.ts +0 -4
- package/dist/types/src/components/DeckLayout/index.d.ts.map +0 -1
- package/dist/types/src/components/Plank/Plank.d.ts +0 -27
- package/dist/types/src/components/Plank/Plank.d.ts.map +0 -1
- package/dist/types/src/components/Plank/Plank.stories.d.ts +0 -107
- package/dist/types/src/components/Plank/Plank.stories.d.ts.map +0 -1
- package/dist/types/src/components/Plank/PlankControls.d.ts.map +0 -1
- package/dist/types/src/components/Plank/PlankError.d.ts +0 -13
- package/dist/types/src/components/Plank/PlankError.d.ts.map +0 -1
- package/dist/types/src/components/Plank/PlankHeading.d.ts.map +0 -1
- package/dist/types/src/components/Plank/index.d.ts +0 -6
- package/dist/types/src/components/Plank/index.d.ts.map +0 -1
- package/dist/types/src/components/Sidebar/ComplementarySidebar.d.ts.map +0 -1
- package/dist/types/src/components/fragments.d.ts +0 -4
- package/dist/types/src/components/fragments.d.ts.map +0 -1
- package/src/capabilities/app-graph-builder/app-graph-builder.ts +0 -118
- package/src/capabilities/app-graph-builder/index.ts +0 -7
- package/src/capabilities/check-app-scheme/check-app-scheme.ts +0 -41
- package/src/capabilities/check-app-scheme/index.ts +0 -7
- package/src/capabilities/operation-resolver/index.ts +0 -10
- package/src/capabilities/operation-resolver/operation-resolver.ts +0 -555
- package/src/capabilities/react-root/index.ts +0 -7
- package/src/capabilities/react-surface/index.ts +0 -7
- package/src/capabilities/react-surface/react-surface.tsx +0 -37
- package/src/capabilities/settings/index.ts +0 -7
- package/src/capabilities/state/index.ts +0 -7
- package/src/capabilities/toolkit/index.ts +0 -7
- package/src/capabilities/toolkit/toolkit.ts +0 -63
- package/src/capabilities/tools/index.ts +0 -7
- package/src/capabilities/url-handler/index.ts +0 -7
- package/src/capabilities/url-handler/url-handler.ts +0 -95
- package/src/components/DeckLayout/ContentEmpty.tsx +0 -30
- package/src/components/DeckLayout/DeckLayout.stories.tsx +0 -51
- package/src/components/DeckLayout/DeckLayout.tsx +0 -34
- package/src/components/DeckLayout/DeckMain.tsx +0 -286
- package/src/components/DeckLayout/Fallback.tsx +0 -28
- package/src/components/DeckLayout/Topbar.tsx +0 -11
- package/src/components/Plank/Plank.stories.tsx +0 -62
- package/src/components/Plank/Plank.tsx +0 -299
- package/src/components/Plank/PlankError.tsx +0 -49
- package/src/components/Sidebar/ComplementarySidebar.tsx +0 -221
- package/src/components/fragments.ts +0 -14
- /package/dist/types/src/{components/DeckLayout → containers/Deck}/Banner.d.ts +0 -0
- /package/dist/types/src/{components/DeckLayout → containers/Deck}/StatusBar.d.ts +0 -0
- /package/dist/types/src/{components → containers}/DeckLayout/ActiveNode.d.ts +0 -0
- /package/dist/types/src/{components → containers}/DeckLayout/DeckLayout.d.ts +0 -0
- /package/dist/types/src/{components → containers}/DeckLayout/Dialog.d.ts +0 -0
- /package/dist/types/src/{components → containers}/DeckLayout/constants.d.ts +0 -0
- /package/dist/types/src/{components → containers}/Plank/PlankLoading.d.ts +0 -0
- /package/dist/types/src/{components → containers}/Sidebar/ComplementarySidebar.d.ts +0 -0
- /package/dist/types/src/{components → containers}/Sidebar/Sidebar.d.ts +0 -0
- /package/dist/types/src/{components → containers}/Sidebar/SidebarButton.d.ts +0 -0
- /package/dist/types/src/{components → containers}/Sidebar/index.d.ts +0 -0
- /package/src/{components → containers}/Sidebar/index.ts +0 -0
|
@@ -1,555 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2025 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import * as Effect from 'effect/Effect';
|
|
6
|
-
import * as Function from 'effect/Function';
|
|
7
|
-
import * as Option from 'effect/Option';
|
|
8
|
-
|
|
9
|
-
import { Capability, Common } from '@dxos/app-framework';
|
|
10
|
-
import { Obj } from '@dxos/echo';
|
|
11
|
-
import { invariant } from '@dxos/invariant';
|
|
12
|
-
import { log } from '@dxos/log';
|
|
13
|
-
import { OperationResolver } from '@dxos/operation';
|
|
14
|
-
import { Operation } from '@dxos/operation';
|
|
15
|
-
import { AttentionCapabilities } from '@dxos/plugin-attention';
|
|
16
|
-
import { Graph, Node } from '@dxos/plugin-graph';
|
|
17
|
-
import { ObservabilityOperation } from '@dxos/plugin-observability/types';
|
|
18
|
-
import { byPosition, isNonNullable } from '@dxos/util';
|
|
19
|
-
|
|
20
|
-
import { closeEntry, createEntryId, incrementPlank, openEntry } from '../../layout';
|
|
21
|
-
import { meta } from '../../meta';
|
|
22
|
-
import {
|
|
23
|
-
DeckCapabilities,
|
|
24
|
-
DeckOperation,
|
|
25
|
-
type DeckState,
|
|
26
|
-
type DeckStateProps,
|
|
27
|
-
type LayoutMode,
|
|
28
|
-
PLANK_COMPANION_TYPE,
|
|
29
|
-
defaultDeck,
|
|
30
|
-
getMode,
|
|
31
|
-
isLayoutMode,
|
|
32
|
-
} from '../../types';
|
|
33
|
-
import { computeActiveUpdates } from '../../util';
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Helper to update the active deck within the persisted state.
|
|
37
|
-
*/
|
|
38
|
-
const updateActiveDeck = (current: DeckStateProps, deckUpdates: Partial<DeckState>): DeckStateProps => {
|
|
39
|
-
const currentDeck = current.decks[current.activeDeck];
|
|
40
|
-
invariant(currentDeck, `Deck not found: ${current.activeDeck}`);
|
|
41
|
-
return {
|
|
42
|
-
...current,
|
|
43
|
-
decks: {
|
|
44
|
-
...current.decks,
|
|
45
|
-
[current.activeDeck]: {
|
|
46
|
-
...currentDeck,
|
|
47
|
-
...deckUpdates,
|
|
48
|
-
},
|
|
49
|
-
},
|
|
50
|
-
};
|
|
51
|
-
};
|
|
52
|
-
|
|
53
|
-
export default Capability.makeModule(
|
|
54
|
-
Effect.fnUntraced(function* () {
|
|
55
|
-
return Capability.contributes(Common.Capability.OperationResolver, [
|
|
56
|
-
//
|
|
57
|
-
// UpdateSidebar
|
|
58
|
-
//
|
|
59
|
-
OperationResolver.make({
|
|
60
|
-
operation: Common.LayoutOperation.UpdateSidebar,
|
|
61
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
62
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
63
|
-
const next = input.state ?? state.sidebarState;
|
|
64
|
-
if (next !== state.sidebarState) {
|
|
65
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => ({ ...s, sidebarState: next }));
|
|
66
|
-
}
|
|
67
|
-
}),
|
|
68
|
-
}),
|
|
69
|
-
|
|
70
|
-
//
|
|
71
|
-
// UpdateComplementary
|
|
72
|
-
//
|
|
73
|
-
OperationResolver.make({
|
|
74
|
-
operation: Common.LayoutOperation.UpdateComplementary,
|
|
75
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
76
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
77
|
-
const panelChanged = state.complementarySidebarPanel !== input.subject;
|
|
78
|
-
const next = input.subject ? 'expanded' : (input.state ?? state.complementarySidebarState);
|
|
79
|
-
const stateChanged = next !== state.complementarySidebarState;
|
|
80
|
-
|
|
81
|
-
if (panelChanged || stateChanged) {
|
|
82
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => ({
|
|
83
|
-
...s,
|
|
84
|
-
complementarySidebarPanel: panelChanged ? input.subject : s.complementarySidebarPanel,
|
|
85
|
-
complementarySidebarState: stateChanged ? next : s.complementarySidebarState,
|
|
86
|
-
}));
|
|
87
|
-
}
|
|
88
|
-
}),
|
|
89
|
-
}),
|
|
90
|
-
|
|
91
|
-
//
|
|
92
|
-
// UpdateDialog
|
|
93
|
-
//
|
|
94
|
-
OperationResolver.make({
|
|
95
|
-
operation: Common.LayoutOperation.UpdateDialog,
|
|
96
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
97
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.EphemeralState, (s) => ({
|
|
98
|
-
...s,
|
|
99
|
-
dialogOpen: input.state ?? Boolean(input.subject),
|
|
100
|
-
dialogType: input.type ?? 'default',
|
|
101
|
-
dialogBlockAlign: input.blockAlign ?? 'center',
|
|
102
|
-
dialogOverlayClasses: input.overlayClasses,
|
|
103
|
-
dialogOverlayStyle: input.overlayStyle,
|
|
104
|
-
dialogContent: input.subject ? { component: input.subject, props: input.props } : null,
|
|
105
|
-
}));
|
|
106
|
-
}),
|
|
107
|
-
}),
|
|
108
|
-
|
|
109
|
-
//
|
|
110
|
-
// UpdatePopover
|
|
111
|
-
//
|
|
112
|
-
OperationResolver.make({
|
|
113
|
-
operation: Common.LayoutOperation.UpdatePopover,
|
|
114
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
115
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.EphemeralState, (s) => ({
|
|
116
|
-
...s,
|
|
117
|
-
popoverOpen: input.state ?? Boolean(input.subject),
|
|
118
|
-
popoverKind: input.kind ?? 'base',
|
|
119
|
-
popoverTitle: input.kind === 'card' ? input.title : undefined,
|
|
120
|
-
popoverContent:
|
|
121
|
-
typeof input.subject === 'string'
|
|
122
|
-
? { component: input.subject, props: input.props }
|
|
123
|
-
: input.subject
|
|
124
|
-
? { subject: input.subject }
|
|
125
|
-
: null,
|
|
126
|
-
popoverSide: input.side,
|
|
127
|
-
popoverAnchor: input.variant === 'virtual' ? input.anchor : s.popoverAnchor,
|
|
128
|
-
popoverAnchorId: input.variant !== 'virtual' ? input.anchorId : s.popoverAnchorId,
|
|
129
|
-
}));
|
|
130
|
-
}),
|
|
131
|
-
}),
|
|
132
|
-
|
|
133
|
-
//
|
|
134
|
-
// AddToast
|
|
135
|
-
//
|
|
136
|
-
OperationResolver.make({
|
|
137
|
-
operation: Common.LayoutOperation.AddToast,
|
|
138
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
139
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.EphemeralState, (s) => ({
|
|
140
|
-
...s,
|
|
141
|
-
toasts: [...s.toasts, input as Common.LayoutOperation.Toast],
|
|
142
|
-
}));
|
|
143
|
-
}),
|
|
144
|
-
}),
|
|
145
|
-
|
|
146
|
-
//
|
|
147
|
-
// ShowUndo
|
|
148
|
-
//
|
|
149
|
-
OperationResolver.make({
|
|
150
|
-
operation: Common.UndoOperation.ShowUndo,
|
|
151
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
152
|
-
const historyTracker = yield* Capability.get(Common.Capability.HistoryTracker);
|
|
153
|
-
|
|
154
|
-
const newUndoId = `show-undo-${Date.now()}`;
|
|
155
|
-
// TODO(wittjosiah): Support undoing further back than the last action.
|
|
156
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.EphemeralState, (s) => {
|
|
157
|
-
const filteredToasts = s.currentUndoId
|
|
158
|
-
? s.toasts.filter((toast) => toast.id !== s.currentUndoId)
|
|
159
|
-
: s.toasts;
|
|
160
|
-
|
|
161
|
-
const toast: Common.LayoutOperation.Toast = {
|
|
162
|
-
id: newUndoId,
|
|
163
|
-
title: input.message ?? ['undo available label', { ns: meta.id }],
|
|
164
|
-
duration: 10_000,
|
|
165
|
-
actionLabel: ['undo action label', { ns: meta.id }],
|
|
166
|
-
actionAlt: ['undo action alt', { ns: meta.id }],
|
|
167
|
-
closeLabel: ['undo close label', { ns: meta.id }],
|
|
168
|
-
onAction: () => historyTracker.undoPromise(),
|
|
169
|
-
};
|
|
170
|
-
|
|
171
|
-
return {
|
|
172
|
-
...s,
|
|
173
|
-
currentUndoId: newUndoId,
|
|
174
|
-
toasts: [...filteredToasts, toast],
|
|
175
|
-
};
|
|
176
|
-
});
|
|
177
|
-
}),
|
|
178
|
-
}),
|
|
179
|
-
|
|
180
|
-
//
|
|
181
|
-
// SetLayoutMode
|
|
182
|
-
//
|
|
183
|
-
OperationResolver.make({
|
|
184
|
-
operation: Common.LayoutOperation.SetLayoutMode,
|
|
185
|
-
filter: (input) => {
|
|
186
|
-
if ('mode' in input) {
|
|
187
|
-
return isLayoutMode(input.mode);
|
|
188
|
-
}
|
|
189
|
-
return true;
|
|
190
|
-
},
|
|
191
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
192
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
193
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
194
|
-
|
|
195
|
-
const computeModeUpdate = (mode: LayoutMode, subject?: string): Partial<DeckState> => {
|
|
196
|
-
const current = deck.solo ? [deck.solo] : deck.active;
|
|
197
|
-
// When un-soloing, the solo entry is added to the deck.
|
|
198
|
-
const next = (
|
|
199
|
-
mode !== 'deck' ? [subject ?? deck.solo ?? deck.active[0]] : [...deck.active, deck.solo]
|
|
200
|
-
).filter(isNonNullable);
|
|
201
|
-
|
|
202
|
-
const removed = current.filter((id: string) => !next.includes(id));
|
|
203
|
-
const closed = Array.from(
|
|
204
|
-
new Set([...deck.inactive.filter((id: string) => !next.includes(id)), ...removed]),
|
|
205
|
-
);
|
|
206
|
-
|
|
207
|
-
// Build deckUpdates object without mutating.
|
|
208
|
-
const soloUpdate =
|
|
209
|
-
mode !== 'deck' && next[0]
|
|
210
|
-
? { solo: next[0] }
|
|
211
|
-
: mode === 'deck' && deck.solo
|
|
212
|
-
? { solo: undefined, initialized: true }
|
|
213
|
-
: {};
|
|
214
|
-
|
|
215
|
-
const fullscreenUpdate = mode === 'solo--fullscreen' ? { fullscreen: !deck.fullscreen } : {};
|
|
216
|
-
|
|
217
|
-
return {
|
|
218
|
-
inactive: closed,
|
|
219
|
-
...soloUpdate,
|
|
220
|
-
...fullscreenUpdate,
|
|
221
|
-
};
|
|
222
|
-
};
|
|
223
|
-
|
|
224
|
-
if ('mode' in input) {
|
|
225
|
-
const currentMode = getMode(deck);
|
|
226
|
-
const deckUpdates = computeModeUpdate(
|
|
227
|
-
input.mode as LayoutMode,
|
|
228
|
-
'subject' in input ? input.subject : undefined,
|
|
229
|
-
);
|
|
230
|
-
|
|
231
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => {
|
|
232
|
-
const newPreviousMode =
|
|
233
|
-
currentMode !== input.mode ? { ...s.previousMode, [s.activeDeck]: currentMode } : s.previousMode;
|
|
234
|
-
return {
|
|
235
|
-
...updateActiveDeck(s, deckUpdates),
|
|
236
|
-
previousMode: newPreviousMode,
|
|
237
|
-
};
|
|
238
|
-
});
|
|
239
|
-
} else if ('revert' in input) {
|
|
240
|
-
const last = state.previousMode[state.activeDeck];
|
|
241
|
-
const deckUpdates = computeModeUpdate(last ?? 'solo');
|
|
242
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => updateActiveDeck(s, deckUpdates));
|
|
243
|
-
} else {
|
|
244
|
-
log.warn('Invalid layout mode', input);
|
|
245
|
-
}
|
|
246
|
-
}),
|
|
247
|
-
}),
|
|
248
|
-
|
|
249
|
-
//
|
|
250
|
-
// SwitchWorkspace
|
|
251
|
-
//
|
|
252
|
-
OperationResolver.make({
|
|
253
|
-
operation: Common.LayoutOperation.SwitchWorkspace,
|
|
254
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
255
|
-
const { graph } = yield* Capability.get(Common.Capability.AppGraph);
|
|
256
|
-
|
|
257
|
-
{
|
|
258
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
259
|
-
// TODO(wittjosiah): This is a hack to prevent the previous deck from being set for pinned items.
|
|
260
|
-
// Ideally this should be worked into the data model in a generic way.
|
|
261
|
-
const shouldUpdatePrevious = !state.activeDeck.startsWith('!');
|
|
262
|
-
|
|
263
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => {
|
|
264
|
-
const newDecks = s.decks[input.subject] ? s.decks : { ...s.decks, [input.subject]: { ...defaultDeck } };
|
|
265
|
-
return {
|
|
266
|
-
...s,
|
|
267
|
-
previousDeck: shouldUpdatePrevious ? s.activeDeck : s.previousDeck,
|
|
268
|
-
activeDeck: input.subject,
|
|
269
|
-
decks: newDecks,
|
|
270
|
-
};
|
|
271
|
-
});
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
{
|
|
275
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
276
|
-
const deck = state.decks[input.subject];
|
|
277
|
-
invariant(deck, `Deck not found: ${input.subject}`);
|
|
278
|
-
|
|
279
|
-
const first = deck.solo ? deck.solo : deck.active[0];
|
|
280
|
-
if (first) {
|
|
281
|
-
yield* Operation.schedule(Common.LayoutOperation.ScrollIntoView, { subject: first });
|
|
282
|
-
} else {
|
|
283
|
-
const [item] = Graph.getConnections(graph, input.subject).filter(
|
|
284
|
-
(node) => !Node.isActionLike(node) && !node.properties.disposition,
|
|
285
|
-
);
|
|
286
|
-
if (item) {
|
|
287
|
-
yield* Operation.schedule(Common.LayoutOperation.Open, { subject: [item.id] });
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
}
|
|
291
|
-
}),
|
|
292
|
-
}),
|
|
293
|
-
|
|
294
|
-
//
|
|
295
|
-
// RevertWorkspace
|
|
296
|
-
//
|
|
297
|
-
OperationResolver.make({
|
|
298
|
-
operation: Common.LayoutOperation.RevertWorkspace,
|
|
299
|
-
handler: Effect.fnUntraced(function* () {
|
|
300
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
301
|
-
yield* Operation.invoke(Common.LayoutOperation.SwitchWorkspace, { subject: state.previousDeck });
|
|
302
|
-
}),
|
|
303
|
-
}),
|
|
304
|
-
|
|
305
|
-
//
|
|
306
|
-
// Open
|
|
307
|
-
//
|
|
308
|
-
OperationResolver.make({
|
|
309
|
-
operation: Common.LayoutOperation.Open,
|
|
310
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
311
|
-
const { graph } = yield* Capability.get(Common.Capability.AppGraph);
|
|
312
|
-
const attention = yield* Capability.get(AttentionCapabilities.Attention);
|
|
313
|
-
const settings = yield* Common.Capability.getAtomValue(DeckCapabilities.Settings);
|
|
314
|
-
|
|
315
|
-
{
|
|
316
|
-
const state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
317
|
-
if (input.workspace && state.activeDeck !== input.workspace) {
|
|
318
|
-
yield* Operation.invoke(Common.LayoutOperation.SwitchWorkspace, { subject: input.workspace });
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
|
|
322
|
-
let previouslyOpenIds: Set<string>;
|
|
323
|
-
{
|
|
324
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
325
|
-
previouslyOpenIds = new Set<string>(deck.solo ? [deck.solo] : deck.active);
|
|
326
|
-
const next = deck.solo
|
|
327
|
-
? input.subject.map((id) => createEntryId(id, input.variant))
|
|
328
|
-
: input.subject.reduce(
|
|
329
|
-
(acc, entryId) =>
|
|
330
|
-
openEntry(acc, entryId, {
|
|
331
|
-
key: input.key,
|
|
332
|
-
positioning: input.positioning ?? settings?.newPlankPositioning,
|
|
333
|
-
pivotId: input.pivotId,
|
|
334
|
-
variant: input.variant,
|
|
335
|
-
}),
|
|
336
|
-
deck.active,
|
|
337
|
-
);
|
|
338
|
-
|
|
339
|
-
const { deckUpdates, toAttend: _toAttend } = computeActiveUpdates({ next, deck, attention });
|
|
340
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => updateActiveDeck(s, deckUpdates));
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
{
|
|
344
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
345
|
-
const ids = deck.solo ? [deck.solo] : deck.active;
|
|
346
|
-
const newlyOpen = ids.filter((i: string) => !previouslyOpenIds.has(i));
|
|
347
|
-
|
|
348
|
-
if (input.scrollIntoView !== false && (newlyOpen[0] ?? input.subject[0])) {
|
|
349
|
-
yield* Operation.schedule(Common.LayoutOperation.ScrollIntoView, {
|
|
350
|
-
subject: newlyOpen[0] ?? input.subject[0],
|
|
351
|
-
});
|
|
352
|
-
}
|
|
353
|
-
|
|
354
|
-
if (newlyOpen[0] ?? input.subject[0]) {
|
|
355
|
-
yield* Operation.schedule(Common.LayoutOperation.Expose, { subject: newlyOpen[0] ?? input.subject[0] });
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
// Send analytics events for newly opened items.
|
|
359
|
-
for (const subjectId of newlyOpen) {
|
|
360
|
-
const typename = Option.match(Graph.getNode(graph, subjectId), {
|
|
361
|
-
onNone: () => undefined,
|
|
362
|
-
onSome: (node) => {
|
|
363
|
-
const active = node.data;
|
|
364
|
-
return Obj.isObject(active) ? Obj.getTypename(active) : undefined;
|
|
365
|
-
},
|
|
366
|
-
});
|
|
367
|
-
yield* Operation.schedule(ObservabilityOperation.SendEvent, {
|
|
368
|
-
name: 'navigation.activate',
|
|
369
|
-
properties: { subjectId, typename },
|
|
370
|
-
});
|
|
371
|
-
}
|
|
372
|
-
}
|
|
373
|
-
}),
|
|
374
|
-
}),
|
|
375
|
-
|
|
376
|
-
//
|
|
377
|
-
// UpdatePlankSize
|
|
378
|
-
//
|
|
379
|
-
OperationResolver.make({
|
|
380
|
-
operation: DeckOperation.UpdatePlankSize,
|
|
381
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
382
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) =>
|
|
383
|
-
updateActiveDeck(s, {
|
|
384
|
-
plankSizing: {
|
|
385
|
-
...s.decks[s.activeDeck]?.plankSizing,
|
|
386
|
-
[input.id]: input.size,
|
|
387
|
-
},
|
|
388
|
-
}),
|
|
389
|
-
);
|
|
390
|
-
}),
|
|
391
|
-
}),
|
|
392
|
-
|
|
393
|
-
//
|
|
394
|
-
// Adjust
|
|
395
|
-
//
|
|
396
|
-
OperationResolver.make({
|
|
397
|
-
operation: DeckOperation.Adjust,
|
|
398
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
399
|
-
const _state = yield* Common.Capability.getAtomValue(DeckCapabilities.State);
|
|
400
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
401
|
-
const attention = yield* Capability.get(AttentionCapabilities.Attention);
|
|
402
|
-
const { graph } = yield* Capability.get(Common.Capability.AppGraph);
|
|
403
|
-
|
|
404
|
-
// Collect layout operations to run after state updates.
|
|
405
|
-
let soloOperation:
|
|
406
|
-
| { type: 'solo'; entryId: string; mode: string }
|
|
407
|
-
| { type: 'unsolo'; entryId: string }
|
|
408
|
-
| undefined;
|
|
409
|
-
|
|
410
|
-
if (input.type === 'increment-end' || input.type === 'increment-start') {
|
|
411
|
-
const next = incrementPlank(deck.active, input);
|
|
412
|
-
const { deckUpdates } = computeActiveUpdates({ next, deck, attention });
|
|
413
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => updateActiveDeck(s, deckUpdates));
|
|
414
|
-
}
|
|
415
|
-
|
|
416
|
-
if (input.type.startsWith('solo')) {
|
|
417
|
-
const entryId = input.id;
|
|
418
|
-
if (!deck.solo) {
|
|
419
|
-
// Solo the entry.
|
|
420
|
-
soloOperation = { type: 'solo', entryId, mode: input.type };
|
|
421
|
-
} else {
|
|
422
|
-
if (input.type === 'solo--fullscreen') {
|
|
423
|
-
// Toggle fullscreen on the current entry.
|
|
424
|
-
soloOperation = { type: 'solo', entryId, mode: 'solo--fullscreen' };
|
|
425
|
-
} else if (input.type === 'solo') {
|
|
426
|
-
// Un-solo the current entry and open it.
|
|
427
|
-
soloOperation = { type: 'unsolo', entryId };
|
|
428
|
-
}
|
|
429
|
-
}
|
|
430
|
-
}
|
|
431
|
-
|
|
432
|
-
// Run collected solo operations.
|
|
433
|
-
if (soloOperation?.type === 'solo') {
|
|
434
|
-
yield* Operation.invoke(Common.LayoutOperation.SetLayoutMode, {
|
|
435
|
-
subject: soloOperation.entryId,
|
|
436
|
-
mode: soloOperation.mode,
|
|
437
|
-
});
|
|
438
|
-
} else if (soloOperation?.type === 'unsolo') {
|
|
439
|
-
yield* Operation.invoke(Common.LayoutOperation.SetLayoutMode, { mode: 'deck' });
|
|
440
|
-
yield* Operation.invoke(Common.LayoutOperation.Open, { subject: [soloOperation.entryId] });
|
|
441
|
-
}
|
|
442
|
-
|
|
443
|
-
if (input.type === 'companion') {
|
|
444
|
-
const companion = Function.pipe(
|
|
445
|
-
Graph.getNode(graph, input.id),
|
|
446
|
-
Option.map((node) =>
|
|
447
|
-
Graph.getConnections(graph, node.id)
|
|
448
|
-
.filter((n) => n.type === PLANK_COMPANION_TYPE)
|
|
449
|
-
.toSorted((a, b) => byPosition(a.properties, b.properties)),
|
|
450
|
-
),
|
|
451
|
-
Option.flatMap((companions) => (companions.length > 0 ? Option.some(companions[0]) : Option.none())),
|
|
452
|
-
);
|
|
453
|
-
|
|
454
|
-
if (Option.isSome(companion)) {
|
|
455
|
-
// TODO(wittjosiah): This should remember the previously selected companion.
|
|
456
|
-
yield* Operation.invoke(DeckOperation.ChangeCompanion, {
|
|
457
|
-
primary: input.id,
|
|
458
|
-
companion: companion.value.id,
|
|
459
|
-
});
|
|
460
|
-
}
|
|
461
|
-
}
|
|
462
|
-
}),
|
|
463
|
-
}),
|
|
464
|
-
|
|
465
|
-
//
|
|
466
|
-
// ChangeCompanion
|
|
467
|
-
//
|
|
468
|
-
OperationResolver.make({
|
|
469
|
-
operation: DeckOperation.ChangeCompanion,
|
|
470
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
471
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
472
|
-
if (input.companion === null) {
|
|
473
|
-
const { [input.primary]: _, ...nextActiveCompanions } = deck.activeCompanions ?? {};
|
|
474
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) =>
|
|
475
|
-
updateActiveDeck(s, { activeCompanions: nextActiveCompanions }),
|
|
476
|
-
);
|
|
477
|
-
} else {
|
|
478
|
-
const companion = input.companion;
|
|
479
|
-
invariant(companion !== input.primary);
|
|
480
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) =>
|
|
481
|
-
updateActiveDeck(s, {
|
|
482
|
-
activeCompanions: {
|
|
483
|
-
...deck.activeCompanions,
|
|
484
|
-
[input.primary]: companion,
|
|
485
|
-
},
|
|
486
|
-
}),
|
|
487
|
-
);
|
|
488
|
-
}
|
|
489
|
-
}),
|
|
490
|
-
}),
|
|
491
|
-
|
|
492
|
-
//
|
|
493
|
-
// Close
|
|
494
|
-
//
|
|
495
|
-
OperationResolver.make({
|
|
496
|
-
operation: Common.LayoutOperation.Close,
|
|
497
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
498
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
499
|
-
const attention = yield* Capability.get(AttentionCapabilities.Attention);
|
|
500
|
-
|
|
501
|
-
const active = deck.solo ? [deck.solo] : deck.active;
|
|
502
|
-
const next = input.subject.reduce((acc, id) => closeEntry(acc, id), active);
|
|
503
|
-
const { deckUpdates, toAttend } = computeActiveUpdates({ next, deck, attention });
|
|
504
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => updateActiveDeck(s, deckUpdates));
|
|
505
|
-
|
|
506
|
-
// Clear companions for closed entries.
|
|
507
|
-
for (const id of input.subject) {
|
|
508
|
-
if (deck.activeCompanions && id in deck.activeCompanions) {
|
|
509
|
-
yield* Operation.invoke(DeckOperation.ChangeCompanion, { primary: id, companion: null });
|
|
510
|
-
}
|
|
511
|
-
}
|
|
512
|
-
|
|
513
|
-
if (toAttend) {
|
|
514
|
-
yield* Operation.schedule(Common.LayoutOperation.ScrollIntoView, { subject: toAttend });
|
|
515
|
-
}
|
|
516
|
-
}),
|
|
517
|
-
}),
|
|
518
|
-
|
|
519
|
-
//
|
|
520
|
-
// Set
|
|
521
|
-
//
|
|
522
|
-
OperationResolver.make({
|
|
523
|
-
operation: Common.LayoutOperation.Set,
|
|
524
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
525
|
-
const deck = yield* DeckCapabilities.getDeck();
|
|
526
|
-
const attention = yield* Capability.get(AttentionCapabilities.Attention);
|
|
527
|
-
|
|
528
|
-
const { deckUpdates, toAttend } = computeActiveUpdates({
|
|
529
|
-
next: input.subject as string[],
|
|
530
|
-
deck,
|
|
531
|
-
attention,
|
|
532
|
-
});
|
|
533
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => updateActiveDeck(s, deckUpdates));
|
|
534
|
-
|
|
535
|
-
if (toAttend) {
|
|
536
|
-
yield* Operation.schedule(Common.LayoutOperation.ScrollIntoView, { subject: toAttend });
|
|
537
|
-
}
|
|
538
|
-
}),
|
|
539
|
-
}),
|
|
540
|
-
|
|
541
|
-
//
|
|
542
|
-
// ScrollIntoView
|
|
543
|
-
//
|
|
544
|
-
OperationResolver.make({
|
|
545
|
-
operation: Common.LayoutOperation.ScrollIntoView,
|
|
546
|
-
handler: Effect.fnUntraced(function* (input) {
|
|
547
|
-
yield* Common.Capability.updateAtomValue(DeckCapabilities.EphemeralState, (s) => ({
|
|
548
|
-
...s,
|
|
549
|
-
scrollIntoView: input.subject,
|
|
550
|
-
}));
|
|
551
|
-
}),
|
|
552
|
-
}),
|
|
553
|
-
]);
|
|
554
|
-
}),
|
|
555
|
-
);
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
//
|
|
2
|
-
// Copyright 2025 DXOS.org
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
import * as Effect from 'effect/Effect';
|
|
6
|
-
import React from 'react';
|
|
7
|
-
|
|
8
|
-
import { Capability, Common } from '@dxos/app-framework';
|
|
9
|
-
import { useSettingsState } from '@dxos/app-framework/react';
|
|
10
|
-
|
|
11
|
-
import { Banner, DeckSettings } from '../../components';
|
|
12
|
-
import { meta } from '../../meta';
|
|
13
|
-
import { type DeckSettingsProps } from '../../types';
|
|
14
|
-
|
|
15
|
-
export default Capability.makeModule(() =>
|
|
16
|
-
Effect.succeed(
|
|
17
|
-
Capability.contributes(Common.Capability.ReactSurface, [
|
|
18
|
-
Common.createSurface({
|
|
19
|
-
id: `${meta.id}/plugin-settings`,
|
|
20
|
-
role: 'article',
|
|
21
|
-
filter: (data): data is { subject: Common.Capability.Settings } =>
|
|
22
|
-
Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
|
|
23
|
-
component: ({ data: { subject } }) => {
|
|
24
|
-
const { settings, updateSettings } = useSettingsState<DeckSettingsProps>(subject.atom);
|
|
25
|
-
return <DeckSettings settings={settings} onSettingsChange={updateSettings} />;
|
|
26
|
-
},
|
|
27
|
-
}),
|
|
28
|
-
Common.createSurface({
|
|
29
|
-
id: `${meta.id}/banner`,
|
|
30
|
-
role: 'banner',
|
|
31
|
-
component: ({ data }: { data: { variant?: 'topbar' | 'sidebar' } }) => {
|
|
32
|
-
return <Banner variant={data.variant} />;
|
|
33
|
-
},
|
|
34
|
-
}),
|
|
35
|
-
]),
|
|
36
|
-
),
|
|
37
|
-
);
|