@jupytergis/base 0.13.2 → 0.13.3

package/lib/commands/index.js

@@ -361,15 +361,12 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
     /**
      * LAYERS and LAYER GROUP actions.
      */
-    commands.addCommand(CommandIDs.renameSelected, {
-        label: trans.__('Rename'),
-        isEnabled: () => {
+    commands.addCommand(CommandIDs.renameSelected, Object.assign({ label: trans.__('Rename'), isEnabled: () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
             return !!selected && Object.keys(selected).length === 1;
-        },
-        execute: async () => {
+        }, execute: async () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
@@ -377,17 +374,13 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 return;
             }
             await Private.renameSelectedItem(model);
-        },
-    });
-    commands.addCommand(CommandIDs.removeSelected, {
-        label: trans.__('Remove'),
-        isEnabled: () => {
+        } }, icons.get(CommandIDs.renameSelected)));
+    commands.addCommand(CommandIDs.removeSelected, Object.assign({ label: trans.__('Remove'), isEnabled: () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
             return !!selected && Object.keys(selected).length > 0;
-        },
-        execute: async () => {
+        }, execute: async () => {
             var _a, _b, _c;
             const model = (_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.model;
             const selected = (_c = (_b = model === null || model === void 0 ? void 0 : model.localState) === null || _b === void 0 ? void 0 : _b.selected) === null || _c === void 0 ? void 0 : _c.value;
@@ -395,8 +388,7 @@ export function addCommands(app, tracker, translator, formSchemaRegistry, layerB
                 return;
             }
             await Private.removeSelectedItems(model);
-        },
-    });
+        } }, icons.get(CommandIDs.removeSelected)));
     commands.addCommand(CommandIDs.moveLayersToGroup, {
         label: args => args['label'] ? args['label'] : trans.__('Move to Root'),
         execute: args => {

package/lib/constants.js

@@ -39,6 +39,8 @@ const iconObject = {
     [CommandIDs.toggleStoryPresentationMode]: {
         iconClass: 'fa fa-book jgis-icon-adjust',
     },
+    [CommandIDs.renameSelected]: { iconClass: 'fa fa-pen' },
+    [CommandIDs.removeSelected]: { iconClass: 'fa fa-trash' },
 };
 /**
  * The registered icons

package/lib/mainview/mainView.js

@@ -663,7 +663,7 @@ export class MainView extends React.Component {
             displayTemporalController: false,
             filterStates: {},
             jgisSettings: this._model.jgisSettings,
-            isSpectaPresentation: false,
+            isSpectaPresentation: this._model.isSpectaMode(),
         };
         this._sources = [];
         this._loadingLayers = new Set();

package/lib/widget.js

@@ -70,10 +70,13 @@ export class JupyterGISPanel extends SplitPanel {
         super({ orientation: 'vertical', spacing: 0 });
         this._consoleOpened = false;
         this._state = state;
-        this._initModel({ model, commandRegistry });
-        this._initView(formSchemaRegistry, annotationModel);
         this._consoleOption = Object.assign({ commandRegistry }, consoleOption);
         this._consoleTracker = consoleTracker;
+        const readyPromise = model.sharedModel.initialSyncReady;
+        readyPromise.then(() => {
+            this._initModel({ model, commandRegistry });
+            this._initView(formSchemaRegistry, annotationModel);
+        });
     }
     _initModel(options) {
         this._view = new ObservableMap();
@@ -94,9 +97,15 @@ export class JupyterGISPanel extends SplitPanel {
         SplitPanel.setStretch(this._jupyterGISMainViewPanel, 1);
     }
     get jupyterGISMainViewPanel() {
+        if (!this._jupyterGISMainViewPanel) {
+            console.warn('JupyterGISPanel not ready (initialSyncReady not resolved)');
+        }
         return this._jupyterGISMainViewPanel;
     }
     get viewChanged() {
+        if (!this._view) {
+            console.warn('JupyterGISPanel not ready (initialSyncReady not resolved)');
+        }
         return this._view.changed;
     }
     /**
@@ -114,6 +123,9 @@ export class JupyterGISPanel extends SplitPanel {
         super.dispose();
     }
     get currentViewModel() {
+        if (!this._mainViewModel) {
+            console.warn('JupyterGISPanel not ready (initialSyncReady not resolved)');
+        }
         return this._mainViewModel;
     }
     get consolePanel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/base",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -44,7 +44,7 @@
     "@jupyter/collaboration": "^4",
     "@jupyter/react-components": "^0.16.6",
     "@jupyter/ydoc": "^2.0.0 || ^3.0.0",
-    "@jupytergis/schema": "^0.13.2",
+    "@jupytergis/schema": "^0.13.3",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",