@dxos/shell 0.3.11-main.0ac3ef5 → 0.3.11-main.0bdf564
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/bundle/shell.mjs +44 -61
- package/dist/bundle/shell.mjs.map +1 -1
- package/dist/bundle/shell.umd.js +2 -2
- package/dist/bundle/shell.umd.js.map +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/react.mjs +18 -29
- package/dist/lib/browser/react.mjs.map +3 -3
- package/dist/types/src/composites/Shell/Shell.d.ts.map +1 -1
- package/dist/types/src/composites/Shell/Shell.js +4 -10
- package/dist/types/src/composites/Shell/Shell.js.map +1 -1
- package/dist/types/src/panels/JoinPanel/JoinPanel.js +3 -4
- package/dist/types/src/panels/JoinPanel/JoinPanel.js.map +1 -1
- package/dist/types/src/panels/JoinPanel/joinMachine.js +1 -1
- package/dist/types/src/panels/JoinPanel/joinMachine.js.map +1 -1
- package/dist/types/src/panels/SpacePanel/SpacePanel.d.ts.map +1 -1
- package/dist/types/src/panels/SpacePanel/SpacePanel.js +3 -5
- package/dist/types/src/panels/SpacePanel/SpacePanel.js.map +1 -1
- package/dist/types/src/panels/SpacePanel/SpacePanel.stories.d.ts.map +1 -1
- package/dist/types/src/panels/SpacePanel/SpacePanel.stories.js +2 -2
- package/dist/types/src/panels/SpacePanel/SpacePanel.stories.js.map +1 -1
- package/dist/types/src/panels/SpacePanel/SpacePanelProps.d.ts +0 -1
- package/dist/types/src/panels/SpacePanel/SpacePanelProps.d.ts.map +1 -1
- package/dist/types/src/panels/SpacePanel/steps/SpaceManager.d.ts +0 -1
- package/dist/types/src/panels/SpacePanel/steps/SpaceManager.d.ts.map +1 -1
- package/dist/types/src/panels/SpacePanel/steps/SpaceManager.js +1 -3
- package/dist/types/src/panels/SpacePanel/steps/SpaceManager.js.map +1 -1
- package/package.json +17 -17
- package/src/composites/Shell/Shell.tsx +2 -9
- package/src/panels/JoinPanel/JoinPanel.tsx +2 -2
- package/src/panels/JoinPanel/joinMachine.ts +1 -1
- package/src/panels/SpacePanel/SpacePanel.stories.tsx +1 -2
- package/src/panels/SpacePanel/SpacePanel.tsx +1 -4
- package/src/panels/SpacePanel/SpacePanelProps.ts +0 -1
- package/src/panels/SpacePanel/steps/SpaceManager.tsx +1 -4
|
@@ -1851,7 +1851,7 @@ var joinMachine = createMachine2({
|
|
|
1851
1851
|
} : context.space
|
|
1852
1852
|
}),
|
|
1853
1853
|
log: (context, event) => {
|
|
1854
|
-
log4("[transition]", {
|
|
1854
|
+
log4.info("[transition]", {
|
|
1855
1855
|
event,
|
|
1856
1856
|
haloInvitation: context.halo.invitation,
|
|
1857
1857
|
spaceInvitation: context.space.invitation
|
|
@@ -2595,11 +2595,12 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
|
|
|
2595
2595
|
}
|
|
2596
2596
|
}
|
|
2597
2597
|
});
|
|
2598
|
+
console.log("[joinState]", joinState);
|
|
2598
2599
|
useEffect4(() => {
|
|
2599
2600
|
const subscription = joinService.subscribe((state) => {
|
|
2600
2601
|
log8("[state]", state, {
|
|
2601
2602
|
F: __dxlog_file8,
|
|
2602
|
-
L:
|
|
2603
|
+
L: 200,
|
|
2603
2604
|
S: void 0,
|
|
2604
2605
|
C: (f, a) => f(...a)
|
|
2605
2606
|
});
|
|
@@ -2793,8 +2794,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
|
|
|
2793
2794
|
propsOnDone?.({
|
|
2794
2795
|
identityKey: joinState.context.halo.invitation?.identityKey ?? null,
|
|
2795
2796
|
swarmKey: joinState.context.halo.invitation?.swarmKey ?? null,
|
|
2796
|
-
spaceKey: joinState.context.halo.invitation?.spaceKey ?? null
|
|
2797
|
-
target: joinState.context.halo.invitation?.target ?? null
|
|
2797
|
+
spaceKey: joinState.context.halo.invitation?.spaceKey ?? null
|
|
2798
2798
|
});
|
|
2799
2799
|
}, [
|
|
2800
2800
|
joinState,
|
|
@@ -2804,8 +2804,7 @@ var JoinPanel = ({ titleId: propsTitleId, mode = "default", initialInvitationCod
|
|
|
2804
2804
|
propsOnDone?.({
|
|
2805
2805
|
identityKey: joinState.context.space.invitation?.identityKey ?? null,
|
|
2806
2806
|
swarmKey: joinState.context.space.invitation?.swarmKey ?? null,
|
|
2807
|
-
spaceKey: joinState.context.space.invitation?.spaceKey ?? null
|
|
2808
|
-
target: joinState.context.space.invitation?.target ?? null
|
|
2807
|
+
spaceKey: joinState.context.space.invitation?.spaceKey ?? null
|
|
2809
2808
|
});
|
|
2810
2809
|
}, [
|
|
2811
2810
|
joinState,
|
|
@@ -2927,7 +2926,7 @@ import { ScrollArea, useTranslation as useTranslation21 } from "@dxos/react-ui";
|
|
|
2927
2926
|
import { descriptionText as descriptionText10, mx as mx21 } from "@dxos/react-ui-theme";
|
|
2928
2927
|
var activeActionKey = "dxos:react-shell/space-manager/active-action";
|
|
2929
2928
|
var SpaceManager = (props) => {
|
|
2930
|
-
const { space
|
|
2929
|
+
const { space } = props;
|
|
2931
2930
|
const { t } = useTranslation21("os");
|
|
2932
2931
|
const config = useConfig();
|
|
2933
2932
|
const invitations = useSpaceInvitations2(space?.key);
|
|
@@ -2948,8 +2947,7 @@ var SpaceManager = (props) => {
|
|
|
2948
2947
|
onClick: useCallback7(() => {
|
|
2949
2948
|
const invitation = space.share?.({
|
|
2950
2949
|
type: Invitation7.Type.INTERACTIVE,
|
|
2951
|
-
authMethod: Invitation7.AuthMethod.SHARED_SECRET
|
|
2952
|
-
target
|
|
2950
|
+
authMethod: Invitation7.AuthMethod.SHARED_SECRET
|
|
2953
2951
|
});
|
|
2954
2952
|
if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== "production") {
|
|
2955
2953
|
invitation.subscribe(onInvitationEvent);
|
|
@@ -2965,8 +2963,7 @@ var SpaceManager = (props) => {
|
|
|
2965
2963
|
onClick: useCallback7(() => {
|
|
2966
2964
|
const invitation = space.share?.({
|
|
2967
2965
|
type: Invitation7.Type.MULTIUSE,
|
|
2968
|
-
authMethod: Invitation7.AuthMethod.NONE
|
|
2969
|
-
target
|
|
2966
|
+
authMethod: Invitation7.AuthMethod.NONE
|
|
2970
2967
|
});
|
|
2971
2968
|
if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== "production") {
|
|
2972
2969
|
invitation.subscribe(onInvitationEvent);
|
|
@@ -3053,7 +3050,7 @@ var SpacePanelHeading = ({ titleId, space, onDone }) => {
|
|
|
3053
3050
|
}, name ?? space.key.truncate())));
|
|
3054
3051
|
};
|
|
3055
3052
|
var SpacePanelImpl = (props) => {
|
|
3056
|
-
const { titleId, activeView, space,
|
|
3053
|
+
const { titleId, activeView, space, SpaceManager: SpaceManagerComponent = SpaceManager, InvitationManager: InvitationManagerComponent = InvitationManager, ...rest } = props;
|
|
3057
3054
|
return /* @__PURE__ */ React37.createElement(DensityProvider4, {
|
|
3058
3055
|
density: "fine"
|
|
3059
3056
|
}, /* @__PURE__ */ React37.createElement(SpacePanelHeading, {
|
|
@@ -3068,7 +3065,6 @@ var SpacePanelImpl = (props) => {
|
|
|
3068
3065
|
}, /* @__PURE__ */ React37.createElement(SpaceManagerComponent, {
|
|
3069
3066
|
active: activeView === "space manager",
|
|
3070
3067
|
space,
|
|
3071
|
-
target,
|
|
3072
3068
|
...rest
|
|
3073
3069
|
})), /* @__PURE__ */ React37.createElement(Viewport.View, {
|
|
3074
3070
|
id: "space invitation manager",
|
|
@@ -3098,7 +3094,7 @@ var SpacePanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => code,
|
|
|
3098
3094
|
const subscription = spaceService.subscribe((state) => {
|
|
3099
3095
|
log10("[state]", state, {
|
|
3100
3096
|
F: __dxlog_file10,
|
|
3101
|
-
L:
|
|
3097
|
+
L: 92,
|
|
3102
3098
|
S: void 0,
|
|
3103
3099
|
C: (f, a) => f(...a)
|
|
3104
3100
|
});
|
|
@@ -3126,13 +3122,10 @@ var SpacePanel = ({ titleId: propsTitleId, createInvitationUrl = (code) => code,
|
|
|
3126
3122
|
titleId,
|
|
3127
3123
|
createInvitationUrl
|
|
3128
3124
|
};
|
|
3129
|
-
return spaceState.context.invitation ? (
|
|
3130
|
-
|
|
3131
|
-
|
|
3132
|
-
|
|
3133
|
-
invitation: spaceState.context.invitation
|
|
3134
|
-
})
|
|
3135
|
-
) : /* @__PURE__ */ React37.createElement(SpacePanelImpl, implProps);
|
|
3125
|
+
return spaceState.context.invitation ? /* @__PURE__ */ React37.createElement(SpacePanelWithInvitationImpl, {
|
|
3126
|
+
...implProps,
|
|
3127
|
+
invitation: spaceState.context.invitation
|
|
3128
|
+
}) : /* @__PURE__ */ React37.createElement(SpacePanelImpl, implProps);
|
|
3136
3129
|
};
|
|
3137
3130
|
|
|
3138
3131
|
// packages/sdk/shell/src/composites/IdentityDialog/IdentityDialog.tsx
|
|
@@ -3221,11 +3214,10 @@ var SpaceDialog = (spacePanelProps) => {
|
|
|
3221
3214
|
// packages/sdk/shell/src/composites/Shell/Shell.tsx
|
|
3222
3215
|
var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/shell/src/composites/Shell/Shell.tsx";
|
|
3223
3216
|
var Shell = ({ runtime, origin }) => {
|
|
3224
|
-
const [{ layout, invitationCode, spaceKey
|
|
3217
|
+
const [{ layout, invitationCode, spaceKey }, setLayout] = useState9({
|
|
3225
3218
|
layout: runtime.layout,
|
|
3226
3219
|
invitationCode: runtime.invitationCode,
|
|
3227
|
-
spaceKey: runtime.spaceKey
|
|
3228
|
-
target: runtime.target
|
|
3220
|
+
spaceKey: runtime.spaceKey
|
|
3229
3221
|
});
|
|
3230
3222
|
const space = useSpace2(spaceKey);
|
|
3231
3223
|
useEffect6(() => {
|
|
@@ -3237,7 +3229,7 @@ var Shell = ({ runtime, origin }) => {
|
|
|
3237
3229
|
if (layout === ShellLayout.SPACE && !space) {
|
|
3238
3230
|
log11.warn("No space found for shell space invitations.", void 0, {
|
|
3239
3231
|
F: __dxlog_file11,
|
|
3240
|
-
L:
|
|
3232
|
+
L: 30,
|
|
3241
3233
|
S: void 0,
|
|
3242
3234
|
C: (f, a) => f(...a)
|
|
3243
3235
|
});
|
|
@@ -3287,7 +3279,6 @@ var Shell = ({ runtime, origin }) => {
|
|
|
3287
3279
|
case ShellLayout.SPACE:
|
|
3288
3280
|
return space ? /* @__PURE__ */ React41.createElement(SpaceDialog, {
|
|
3289
3281
|
space,
|
|
3290
|
-
target,
|
|
3291
3282
|
createInvitationUrl: (invitationCode2) => `${origin}?spaceInvitationCode=${invitationCode2}`,
|
|
3292
3283
|
onDone: async () => {
|
|
3293
3284
|
await runtime.setAppContext({
|
|
@@ -3302,11 +3293,9 @@ var Shell = ({ runtime, origin }) => {
|
|
|
3302
3293
|
return /* @__PURE__ */ React41.createElement(JoinDialog, {
|
|
3303
3294
|
initialInvitationCode: invitationCode,
|
|
3304
3295
|
onDone: async (result) => {
|
|
3305
|
-
const target2 = result?.target ?? void 0;
|
|
3306
3296
|
await runtime.setAppContext({
|
|
3307
3297
|
display: ShellDisplay.NONE,
|
|
3308
|
-
spaceKey: result?.spaceKey ?? void 0
|
|
3309
|
-
target: target2
|
|
3298
|
+
spaceKey: result?.spaceKey ?? void 0
|
|
3310
3299
|
});
|
|
3311
3300
|
runtime.setLayout({
|
|
3312
3301
|
layout: ShellLayout.DEFAULT
|