@jupytergis/jupytergis-lab 0.4.4 → 0.5.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { CommandIDs, ControlPanelModel, GlobalStateDbManager, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, logoMiniIcon } from '@jupytergis/base';
+import { CommandIDs, ControlPanelModel, GlobalStateDbManager, LeftPanelWidget, RightPanelWidget, addCommands, createDefaultLayerRegistry, rasterSubMenu, vectorSubMenu, logoMiniIcon } from '@jupytergis/base';
 import { IAnnotationToken, IJGISFormSchemaRegistryToken, IJGISLayerBrowserRegistryToken, IJupyterGISDocTracker } from '@jupytergis/schema';
 import { ILayoutRestorer } from '@jupyterlab/application';
 import { ICompletionProviderManager } from '@jupyterlab/completer';
@@ -29,43 +29,6 @@ const plugin = {
         const stateDbManager = GlobalStateDbManager.getInstance();
         stateDbManager.initialize(state);
         addCommands(app, tracker, translator, formSchemaRegistry, layerBrowserRegistry, state, completionProviderManager);
-        // SOURCES context menu
-        const newSourceSubMenu = new Menu({ commands: app.commands });
-        newSourceSubMenu.title.label = translator
-            .load('jupyterlab')
-            .__('Add Source');
-        newSourceSubMenu.id = 'jp-gis-contextmenu-addSource';
-        app.contextMenu.addItem({
-            type: 'submenu',
-            selector: '.jp-gis-sourcePanel',
-            rank: 3,
-            submenu: newSourceSubMenu
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newRasterSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newVectorSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newGeoJSONSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newRasterDemSource,
-            args: { from: 'contextMenu' }
-        });
-        newSourceSubMenu.addItem({
-            command: CommandIDs.newImageSource,
-            args: { from: 'contextMenu' }
-        });
-        app.contextMenu.addItem({
-            type: 'separator',
-            selector: '.jp-gis-sourcePanel',
-            rank: 2
-        });
         app.contextMenu.addItem({
             selector: '.jp-gis-source.jp-gis-sourceUnused',
             rank: 1,
@@ -166,32 +129,20 @@ const plugin = {
         const newLayerSubMenu = new Menu({ commands: app.commands });
         newLayerSubMenu.title.label = translator.load('jupyterlab').__('Add Layer');
         newLayerSubMenu.id = 'jp-gis-contextmenu-addLayer';
+        newLayerSubMenu.addItem({
+            type: 'submenu',
+            submenu: rasterSubMenu(app.commands)
+        });
+        newLayerSubMenu.addItem({
+            type: 'submenu',
+            submenu: vectorSubMenu(app.commands)
+        });
         app.contextMenu.addItem({
             type: 'submenu',
             selector: '.jp-gis-layerPanel',
             rank: 3,
             submenu: newLayerSubMenu
         });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newRasterLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newVectorLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newHillshadeLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newImageLayer,
-            args: { from: 'contextMenu' }
-        });
-        newLayerSubMenu.addItem({
-            command: CommandIDs.newHeatmapLayer,
-            args: { from: 'contextMenu' }
-        });
         if (mainMenu) {
             populateMenus(mainMenu, isEnabled);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytergis/jupytergis-lab",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "JupyterGIS Lab extension.",
   "keywords": [
     "jupyter",
@@ -53,8 +53,8 @@
   },
   "dependencies": {
     "@jupyter/collaborative-drive": "^3.0.0",
-    "@jupytergis/base": "^0.4.4",
-    "@jupytergis/schema": "^0.4.4",
+    "@jupytergis/base": "^0.5.0",
+    "@jupytergis/schema": "^0.5.0",
     "@jupyterlab/application": "^4.3.0",
     "@jupyterlab/apputils": "^4.3.0",
     "@jupyterlab/completer": "^4.3.0",

package/style/base.css

@@ -95,6 +95,7 @@
 }
 
 .jGIS-sidepanel-widget {
+  overflow: auto;
   height: 100%;
 }
 
@@ -235,7 +236,7 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   margin-left: 1px;
   margin-top: 1px;
   padding: 1em;
-  color: #fff;
+  color: var(--jp-ui-font-color0);
   background: var(--jp-layout-color1);
   border-radius: 0.5em;
   font-size: 12px;
@@ -252,10 +253,6 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   overflow: auto;
 }
 
-.jGIS-Annotations {
-  overflow: auto;
-}
-
 .jGIS-Annotation-Card {
   max-height: 400px;
   overflow: auto;
@@ -376,6 +373,11 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   z-index: 20;
 }
 
+.jGIS-Remote-Pointer-Icon {
+  filter: drop-shadow(-1px 0px white) drop-shadow(1px 0px white)
+    drop-shadow(0px -1px white) drop-shadow(0px 1px white)
+    drop-shadow(0px 0px 1px black);
+}
 .jGIS-Remote-Pointer-Icon:hover {
   scale: 1.3;
 }
@@ -420,6 +422,18 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   height: 600px;
   width: 100%;
 }
+
+/* Support output views, created with "Create new view for cell output" context menu */
+.jp-LinkedOutputView .jp-OutputArea-child:only-child {
+  /* NOTE: This will eventually be supported directly in JupyterLab
+   * (https://github.com/jupyterlab/jupyterlab/pull/17487), but we should keep
+   * it around for a while for backwards compatibility. */
+  height: 100%;
+}
+.jp-LinkedOutputView .jupytergis-notebook-widget {
+  height: 100%;
+}
+
 .jupytergis-notebook-widget > div {
   height: 100%;
   width: 100%;
@@ -690,6 +704,9 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
 
 .jgis-identify-grid-item-header {
   display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
   grid-column: span 2;
   font-weight: bold;
   font-size: var(--jp-ui-font-size1);
@@ -739,6 +756,11 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   padding-bottom: 8px;
 }
 
+.jgis-scrollable {
+  overflow: auto;
+  height: 100%;
+}
+
 /* Style the file path text */
 .file-container {
   display: flex;
@@ -746,3 +768,25 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
   margin-bottom: 16px;
   gap: 10px;
 }
+
+.jgis-highlight-button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 28px;
+  min-height: 28px;
+}
+
+.jgis-highlight-button:hover {
+  color: var(--jp-brand-color1);
+}
+
+.jgis-highlight-button:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+  pointer-events: auto;
+}