@jupytergis/base 0.15.0 → 0.16.0-alpha.1

package/lib/mainview/mainviewwidget.d.ts

@@ -1,12 +1,16 @@
 import { IAnnotationModel, IJGISFormSchemaRegistry } from '@jupytergis/schema';
 import { ReactWidget } from '@jupyterlab/apputils';
+import type { ILoggerRegistry } from '@jupyterlab/logconsole';
+import type { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { IStateDB } from '@jupyterlab/statedb';
-import { MainViewModel } from './mainviewmodel';
+import { MainViewModel } from "./mainviewmodel";
 export interface IOptions {
     mainViewModel: MainViewModel;
     state?: IStateDB;
     formSchemaRegistry?: IJGISFormSchemaRegistry;
     annotationModel?: IAnnotationModel;
+    loggerRegistry?: ILoggerRegistry;
+    rendermime?: IRenderMimeRegistry | null;
 }
 export declare class JupyterGISMainViewPanel extends ReactWidget {
     /**

package/lib/mainview/mainviewwidget.js

@@ -1,6 +1,7 @@
 import { ReactWidget } from '@jupyterlab/apputils';
 import * as React from 'react';
-import { MainViewWithMediaQuery } from './mainView';
+import { StoryRenderMimeProvider } from "../features/story/components/ListStoryOverlayMarkdown";
+import { MainViewWithMediaQuery } from "./mainView";
 export class JupyterGISMainViewPanel extends ReactWidget {
     /**
      * Construct a `JupyterGISPanel`.
@@ -12,6 +13,7 @@ export class JupyterGISMainViewPanel extends ReactWidget {
         this._options = options;
     }
     render() {
-        return (React.createElement(MainViewWithMediaQuery, { state: this._state, viewModel: this._options.mainViewModel, formSchemaRegistry: this._options.formSchemaRegistry, annotationModel: this._options.annotationModel }));
+        return (React.createElement(StoryRenderMimeProvider, { rendermime: this._options.rendermime },
+            React.createElement(MainViewWithMediaQuery, { state: this._state, viewModel: this._options.mainViewModel, formSchemaRegistry: this._options.formSchemaRegistry, annotationModel: this._options.annotationModel, loggerRegistry: this._options.loggerRegistry })));
     }
 }

package/lib/shared/components/Button.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 interface IButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
     asChild?: boolean;
     variant?: 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link' | 'icon';
-    size?: 'sm' | 'lg' | 'icon' | 'icon-sm';
+    size?: 'sm' | 'lg' | 'icon' | 'icon-sm' | 'icon-md';
 }
 declare const Button: React.ForwardRefExoticComponent<IButtonProps & React.RefAttributes<HTMLButtonElement>>;
 export { Button };

package/lib/shared/components/DropdownMenu.d.ts

@@ -13,6 +13,7 @@ declare const DropdownMenuSubContent: React.ForwardRefExoticComponent<Omit<Dropd
 declare const DropdownMenuContent: React.ForwardRefExoticComponent<Omit<DropdownMenuPrimitive.DropdownMenuContentProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 declare const DropdownMenuItem: React.ForwardRefExoticComponent<Omit<DropdownMenuPrimitive.DropdownMenuItemProps & React.RefAttributes<HTMLDivElement>, "ref"> & {
     inset?: boolean;
+    variant?: "default" | "destructive";
 } & React.RefAttributes<HTMLDivElement>>;
 declare const DropdownMenuCheckboxItem: React.ForwardRefExoticComponent<Omit<DropdownMenuPrimitive.DropdownMenuCheckboxItemProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 declare const DropdownMenuRadioItem: React.ForwardRefExoticComponent<Omit<DropdownMenuPrimitive.DropdownMenuRadioItemProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;

package/lib/shared/components/DropdownMenu.js

@@ -12,6 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { Check, ChevronRight, Circle } from 'lucide-react';
 import { DropdownMenu as DropdownMenuPrimitive } from 'radix-ui';
 import * as React from 'react';
+import { cn } from './utils';
 const DropdownMenu = DropdownMenuPrimitive.Root;
 const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
 const DropdownMenuGroup = DropdownMenuPrimitive.Group;
@@ -41,8 +42,8 @@ const DropdownMenuContent = React.forwardRef((_a, ref) => {
 });
 DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
 const DropdownMenuItem = React.forwardRef((_a, ref) => {
-    var { inset } = _a, props = __rest(_a, ["inset"]);
-    return (React.createElement(DropdownMenuPrimitive.Item, Object.assign({ ref: ref, className: 'jgis-dropdown-menu-item', style: {
+    var { inset, variant = 'default', className } = _a, props = __rest(_a, ["inset", "variant", "className"]);
+    return (React.createElement(DropdownMenuPrimitive.Item, Object.assign({ ref: ref, "data-variant": variant, className: cn('jgis-dropdown-menu-item', className), style: {
             paddingLeft: inset ? '2rem' : '0.5rem',
         } }, props)));
 });

package/lib/shared/components/NativeSelect.d.ts

@@ -0,0 +1,8 @@
+import * as React from 'react';
+type NativeSelectProps = Omit<React.ComponentProps<'select'>, 'size'> & {
+    size?: 'sm' | 'default';
+};
+declare function NativeSelect({ className, size, ...props }: NativeSelectProps): React.JSX.Element;
+declare function NativeSelectOption({ className, ...props }: React.ComponentProps<'option'>): React.JSX.Element;
+declare function NativeSelectOptGroup({ className, ...props }: React.ComponentProps<'optgroup'>): React.JSX.Element;
+export { NativeSelect, NativeSelectOptGroup, NativeSelectOption };

package/lib/shared/components/NativeSelect.js

@@ -0,0 +1,29 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { ChevronDownIcon } from 'lucide-react';
+import * as React from 'react';
+import { cn } from './utils';
+function NativeSelect(_a) {
+    var { className, size = 'default' } = _a, props = __rest(_a, ["className", "size"]);
+    return (React.createElement("div", { className: cn('jgis-native-select', className), "data-slot": "native-select-wrapper", "data-size": size },
+        React.createElement("select", Object.assign({ "data-slot": "native-select", "data-size": size }, props)),
+        React.createElement(ChevronDownIcon, { className: "jgis-native-select-icon", "aria-hidden": "true", "data-slot": "native-select-icon" })));
+}
+function NativeSelectOption(_a) {
+    var { className } = _a, props = __rest(_a, ["className"]);
+    return (React.createElement("option", Object.assign({ "data-slot": "native-select-option", className: cn(className) }, props)));
+}
+function NativeSelectOptGroup(_a) {
+    var { className } = _a, props = __rest(_a, ["className"]);
+    return (React.createElement("optgroup", Object.assign({ "data-slot": "native-select-optgroup", className: cn(className) }, props)));
+}
+export { NativeSelect, NativeSelectOptGroup, NativeSelectOption };

package/lib/shared/components/Tabs.d.ts

@@ -6,8 +6,8 @@ interface IPanelTabProps {
     children: any;
 }
 declare const Tabs: React.FC<React.ComponentProps<typeof TabsPrimitive.Root>>;
-declare const PanelTabs: React.FC<IPanelTabProps>;
-declare const TabsList: React.FC<React.ComponentProps<typeof TabsPrimitive.List>>;
+declare const TabsRoot: React.FC<IPanelTabProps>;
+declare const TabsList: React.ForwardRefExoticComponent<Omit<TabsPrimitive.TabsListProps & React.RefAttributes<HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
 declare const TabsTrigger: React.FC<React.ComponentProps<typeof TabsPrimitive.Trigger>>;
 declare const TabsContent: React.FC<React.ComponentProps<typeof TabsPrimitive.Content>>;
-export { Tabs, TabsContent, TabsList, TabsTrigger, PanelTabs };
+export { Tabs, TabsContent, TabsList, TabsTrigger, TabsRoot };

package/lib/shared/components/Tabs.js

@@ -16,15 +16,15 @@ const Tabs = (_a) => {
     var { className } = _a, props = __rest(_a, ["className"]);
     return (React.createElement(TabsPrimitive.Root, Object.assign({ "data-slot": "tabs", className: cn('TabsList', className) }, props)));
 };
-const PanelTabs = ({ className, curTab, children, }) => {
+const TabsRoot = ({ className, curTab, children, }) => {
     return (React.createElement(TabsPrimitive.Root, { "data-slot": "tabs", className: cn('TabsList', className), value: curTab, onValueChange: () => {
             return;
         }, children: children }));
 };
-const TabsList = (_a) => {
+const TabsList = React.forwardRef((_a, ref) => {
     var { className } = _a, props = __rest(_a, ["className"]);
-    return (React.createElement(TabsPrimitive.List, Object.assign({ "data-slot": "tabs-list", className: cn('jgis-tabs-list', className) }, props)));
-};
+    return (React.createElement(TabsPrimitive.List, Object.assign({ ref: ref, "data-slot": "tabs-list", className: cn('jgis-tabs-list', className) }, props)));
+});
 const TabsTrigger = (_a) => {
     var { className } = _a, props = __rest(_a, ["className"]);
     return (React.createElement(TabsPrimitive.Trigger, Object.assign({ "data-slot": "tabs-trigger", className: cn('jgis-tabs-trigger', className) }, props)));
@@ -33,4 +33,4 @@ const TabsContent = (_a) => {
     var { className } = _a, props = __rest(_a, ["className"]);
     return (React.createElement(TabsPrimitive.Content, Object.assign({ "data-slot": "tabs-content", className: cn('jgis-tabs-content', className) }, props)));
 };
-export { Tabs, TabsContent, TabsList, TabsTrigger, PanelTabs };
+export { Tabs, TabsContent, TabsList, TabsTrigger, TabsRoot };

package/lib/{formbuilder → shared/formbuilder}/creationform.js

@@ -9,10 +9,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { showErrorMessage } from '@jupyterlab/apputils';
 import { UUID } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import React, { useEffect, useMemo, useRef } from 'react';
-import { deepCopy } from "../tools";
+import { deepCopy, getGeoPackageTableNames } from "../..";
 import { getLayerTypeForm, getSourceTypeForm } from './formselectors';
 /**
  * Form for creating a source, a layer or both at the same time
@@ -48,6 +49,7 @@ export function CreationForm(props) {
     const createSourceRef = useRef(createSource);
     const sourceTypeRef = useRef(sourceType);
     const layerTypeRef = useRef(layerType);
+    // const dialogOptionsRef = useRef(dialogOptions);
     modelRef.current = model;
     createLayerRef.current = createLayer;
     createSourceRef.current = createSource;
@@ -65,10 +67,76 @@ export function CreationForm(props) {
             const currentSourceType = sourceTypeRef.current;
             const currentLayerType = layerTypeRef.current;
             const currentSourceId = sourceIdRef.current;
+            let sourceData = (_a = sourceFormDataRef.current) !== null && _a !== void 0 ? _a : {};
+            if (currentCreateSource &&
+                currentSourceType === 'GeoJSONSource' &&
+                !sourceData.path &&
+                !sourceData.data) {
+                sourceData = Object.assign(Object.assign({}, sourceData), { data: {
+                        type: 'FeatureCollection',
+                        features: [],
+                    } });
+            }
+            sourceFormDataRef.current = sourceData;
+            const layerData = (_b = layerFormDataRef.current) !== null && _b !== void 0 ? _b : {};
+            // GeoPackage handling
+            if (currentSourceType === 'GeoPackageVectorSource' ||
+                currentSourceType === 'GeoPackageRasterSource') {
+                (async () => {
+                    if (!currentCreateSource) {
+                        console.error('GeoPackage handling requires source creation');
+                        return;
+                    }
+                    const { name: sourceName } = sourceData, sourceParams = __rest(sourceData, ["name"]);
+                    const allTables = await getGeoPackageTableNames(sourceParams.path, currentSourceType);
+                    let tableNames;
+                    if (sourceParams.tables) {
+                        const requested = sourceParams.tables
+                            .split(',')
+                            .map((s) => s.trim())
+                            .filter(Boolean);
+                        const invalid = requested.filter((t) => !allTables.includes(t));
+                        if (invalid.length) {
+                            showErrorMessage('Invalid GeoPackage Tables', `Invalid: ${invalid.join(', ')}. Available: ${allTables.join(', ')}`);
+                        }
+                        tableNames = requested.filter((t) => allTables.includes(t));
+                        if (!tableNames.length) {
+                            console.warn('No valid tables. Aborting.');
+                            return;
+                        }
+                    }
+                    else {
+                        tableNames = allTables;
+                    }
+                    for (const tableName of tableNames) {
+                        const childId = `${currentSourceId}/${tableName}`;
+                        if (currentCreateSource) {
+                            const sourceModel = {
+                                type: currentSourceType,
+                                name: `${sourceName !== null && sourceName !== void 0 ? sourceName : 'Source'} ${tableName} Source`,
+                                parameters: Object.assign(Object.assign({}, sourceParams), { tables: tableName }),
+                            };
+                            currentModel.sharedModel.addSource(childId, sourceModel);
+                        }
+                        if (currentCreateLayer) {
+                            const layerModel = {
+                                type: currentLayerType ||
+                                    (currentSourceType === 'GeoPackageVectorSource'
+                                        ? 'VectorLayer'
+                                        : 'RasterLayer'),
+                                parameters: { source: childId },
+                                visible: true,
+                                name: `${sourceName !== null && sourceName !== void 0 ? sourceName : 'Layer'} ${tableName} Layer`,
+                            };
+                            currentModel.addLayer(UUID.uuid4(), layerModel);
+                        }
+                    }
+                })();
+                return;
+            }
+            // Normal flow
             if (currentCreateSource) {
-                const sourceData = (_a = sourceFormDataRef.current) !== null && _a !== void 0 ? _a : {};
                 const { name } = sourceData, sourceParams = __rest(sourceData, ["name"]);
-                const layerData = layerFormDataRef.current;
                 const actualName = name ||
                     (currentCreateLayer && (layerData === null || layerData === void 0 ? void 0 : layerData.name)
                         ? `${layerData.name} Source`
@@ -81,7 +149,6 @@ export function CreationForm(props) {
                 currentModel.sharedModel.addSource(currentSourceId, sourceModel);
             }
             if (currentCreateLayer) {
-                const layerData = (_b = layerFormDataRef.current) !== null && _b !== void 0 ? _b : {};
                 const { name } = layerData, layerParams = __rest(layerData, ["name"]);
                 const actualName = name || `${(_c = layerData.name) !== null && _c !== void 0 ? _c : 'Layer'} Layer`;
                 const layerModel = {

package/lib/{formbuilder → shared/formbuilder}/editform.js

@@ -1,6 +1,6 @@
 import { Signal } from '@lumino/signaling';
 import * as React from 'react';
-import { deepCopy } from "../tools";
+import { deepCopy } from "../../tools";
 import { getLayerTypeForm, getSourceTypeForm } from './formselectors';
 function syncObjectProperties(model, id, properties) {
     if (!id) {

package/lib/{formbuilder → shared/formbuilder}/formselectors.d.ts

@@ -1,6 +1,6 @@
 import { LayerType, SourceType } from '@jupytergis/schema';
 import * as React from 'react';
-import type { ILayerProps } from './objectform/layer/layerform';
-import type { ISourceFormProps } from './objectform/source/sourceform';
+import type { ILayerProps } from "../../features/layers/forms/layer/layerform";
+import type { ISourceFormProps } from "../../features/layers/forms/source/sourceform";
 export declare function getLayerTypeForm(layerType: LayerType): React.ComponentType<ILayerProps>;
 export declare function getSourceTypeForm(sourceType: SourceType): React.ComponentType<ISourceFormProps>;

package/lib/{formbuilder → shared/formbuilder}/formselectors.js

@@ -1,5 +1,5 @@
-import { HeatmapLayerPropertiesForm, HillshadeLayerPropertiesForm, StorySegmentLayerPropertiesForm, LayerPropertiesForm, VectorLayerPropertiesForm, WebGlLayerPropertiesForm, } from './objectform/layer';
-import { GeoJSONSourcePropertiesForm, GeoTiffSourcePropertiesForm, PathBasedSourcePropertiesForm, TileSourcePropertiesForm, WmsTileSourceForm, SourcePropertiesForm, } from './objectform/source';
+import { HillshadeLayerPropertiesForm, StorySegmentLayerPropertiesForm, LayerPropertiesForm, VectorLayerPropertiesForm, GeoTiffLayerPropertiesForm, } from "../../features/layers/forms/layer";
+import { GeoJSONSourcePropertiesForm, GeoTiffSourcePropertiesForm, PathBasedSourcePropertiesForm, TileSourcePropertiesForm, WmsTileSourceForm, SourcePropertiesForm, GeoPackagePropertiesForm, } from "../../features/layers/forms/source";
 export function getLayerTypeForm(layerType) {
     let LayerForm = LayerPropertiesForm;
     switch (layerType) {
@@ -10,11 +10,8 @@ export function getLayerTypeForm(layerType) {
         case 'HillshadeLayer':
             LayerForm = HillshadeLayerPropertiesForm;
             break;
-        case 'WebGlLayer':
-            LayerForm = WebGlLayerPropertiesForm;
-            break;
-        case 'HeatmapLayer':
-            LayerForm = HeatmapLayerPropertiesForm;
+        case 'GeoTiffLayer':
+            LayerForm = GeoTiffLayerPropertiesForm;
             break;
         case 'StorySegmentLayer':
             LayerForm = StorySegmentLayerPropertiesForm;
@@ -45,6 +42,12 @@ export function getSourceTypeForm(sourceType) {
         case 'VectorTileSource':
             SourceForm = TileSourcePropertiesForm;
             break;
+        case 'GeoPackageVectorSource':
+            SourceForm = GeoPackagePropertiesForm;
+            break;
+        case 'GeoPackageRasterSource':
+            SourceForm = GeoPackagePropertiesForm;
+            break;
         case 'GeoParquetSource':
             SourceForm = PathBasedSourcePropertiesForm;
             break;

package/lib/shared/formbuilder/index.d.ts

@@ -0,0 +1,4 @@
+export * from './objectform/SchemaForm';
+export * from "../../features/layers/forms/source";
+export * from "../../features/layers/forms/layer";
+export * from './creationform';

package/lib/shared/formbuilder/index.js

@@ -0,0 +1,4 @@
+export * from './objectform/SchemaForm';
+export * from "../../features/layers/forms/source";
+export * from "../../features/layers/forms/layer";
+export * from './creationform';

package/lib/{formbuilder → shared/formbuilder}/objectform/SchemaForm.d.ts

@@ -1,7 +1,7 @@
 import type { Signal } from '@lumino/signaling';
 import { RegistryFieldsType, UiSchema } from '@rjsf/utils';
 import React from 'react';
-import { IDict, type IJupyterGISFormContext } from "../../types";
+import { IDict, type IJupyterGISFormContext } from "../../../types";
 export interface ISchemaFormProps {
     /** JSON Schema for the form. */
     schema: IDict;

package/lib/{formbuilder → shared/formbuilder}/objectform/StoryEditorForm.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-import type { IBaseFormProps } from "../../types";
+import type { IBaseFormProps } from "../../../types";
 export declare function StoryEditorPropertiesForm(props: IBaseFormProps): React.ReactElement | null;

package/lib/{formbuilder → shared/formbuilder}/objectform/StoryEditorForm.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import { deepCopy } from "../../tools";
+import { deepCopy } from "../../../tools";
 import { SchemaForm } from './SchemaForm';
 import { processBaseSchema, removeFormEntry } from './schemaUtils';
 import { useSchemaFormState } from './useSchemaFormState';

package/lib/{formbuilder → shared/formbuilder}/objectform/components/LayerSelect.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { extractLayerOverrideIndex } from "../../../tools";
+import { extractLayerOverrideIndex } from "../../../../tools";
 /**
  * Simple select populated with layers (valid types only).
  * Used as the targetLayer field inside layerOverride array items.

package/lib/{formbuilder → shared/formbuilder}/objectform/components/SegmentFormSymbology.js

@@ -1,10 +1,10 @@
 import { ChevronRightIcon } from 'lucide-react';
 import React from 'react';
-import { SymbologyWidget } from "../../../dialogs/symbology/symbologyDialog";
-import { Button } from "../../../shared/components/Button";
-import { Collapsible, CollapsibleContent, CollapsibleTrigger, } from "../../../shared/components/Collapsible";
+import { SymbologyWidget } from "../../../../features/layers/symbology/symbologyDialog";
+import { Button } from "../../../components/Button";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger, } from "../../../components/Collapsible";
 import { GlobalStateDbManager } from "../../../store";
-import { SYMBOLOGY_VALID_LAYER_TYPES, } from "../../../types";
+import { SYMBOLOGY_VALID_LAYER_TYPES, } from "../../../../types";
 const SELECTION_SETTLE_MS = 100;
 function LayerOverrideItem({ item, formContext }) {
     var _a, _b;

package/lib/{formbuilder → shared/formbuilder}/objectform/components/SourcePropertiesField.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { deepCopy, extractLayerOverrideIndex } from "../../../tools";
+import { deepCopy, extractLayerOverrideIndex } from "../../../../tools";
 import { getSourceTypeForm } from '../../formselectors';
 /**
  * RJSF custom field for layerOverride[].sourceProperties: renders the

package/lib/{formbuilder → shared/formbuilder}/objectform/components/StorySegmentReset.js

@@ -1,7 +1,7 @@
 import { LabIcon } from '@jupyterlab/ui-components';
 import React from 'react';
+import { Button } from "../../../components/Button";
 import { targetWithCenterIcon } from "../../../icons";
-import { Button } from "../../../shared/components/Button";
 function StorySegmentReset({ model, layerId }) {
     const handleSetStorySegmentToCurrentView = () => {
         if (!model || !layerId) {

package/lib/{formbuilder → shared/formbuilder}/objectform/components/WmsTileSourceUrlInput.js

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
-import { WMS_AVAILABLE_LAYERS_CACHE } from "../source";
-import { Button } from "../../../shared/components/Button";
-import { Input } from "../../../shared/components/Input";
+import { WMS_AVAILABLE_LAYERS_CACHE } from "../../../../features/layers/forms/source";
+import { Button } from "../../../components/Button";
+import { Input } from "../../../components/Input";
 import { GlobalStateDbManager } from "../../../store";
-import { fetchWithProxies } from "../../../tools";
+import { fetchWithProxies } from "../../../../tools";
 export function WmsTileSourceUrlInput(props) {
     var _a;
     const { value, formContext, onChange, id, name, onBlur, onFocus, disabled, readonly, } = props;

package/lib/{formbuilder → shared/formbuilder}/objectform/fileselectorwidget.js

@@ -2,7 +2,7 @@ import { Dialog } from '@jupyterlab/apputils';
 import { PathExt } from '@jupyterlab/coreutils';
 import { FileDialog } from '@jupyterlab/filebrowser';
 import React, { useState, useEffect, useRef } from 'react';
-import { LayerCreationFormDialog } from "../../dialogs/layerCreationFormDialog";
+import { LayerCreationFormDialog } from "../../../features/layers/layerCreationFormDialog";
 export const FileSelectorWidget = props => {
     const { options } = props;
     const { docManager, formOptions } = options;
@@ -23,6 +23,7 @@ export const FileSelectorWidget = props => {
         }
     }, [props.value]);
     const handleBrowseServerFiles = async () => {
+        var _a, _b, _c;
         try {
             const dialogElement = document.querySelector('dialog[aria-modal="true"]');
             if (dialogElement) {
@@ -44,6 +45,12 @@ export const FileSelectorWidget = props => {
                 setServerFilePath(relativePath);
                 setUrlPath('');
                 props.onChange(relativePath);
+                const fileName = (_b = (_a = relativePath
+                    .split('/')
+                    .pop()) === null || _a === void 0 ? void 0 : _a.replace(/\.[^.]+$/, '')) !== null && _b !== void 0 ? _b : '';
+                if (fileName && ((_c = formOptions.dialogOptions) === null || _c === void 0 ? void 0 : _c.layerData)) {
+                    formOptions.dialogOptions.layerData.name = fileName;
+                }
                 if (dialogElement) {
                     if (formOptions.sourceType === 'GeoTiffSource') {
                         formOptions.dialogOptions.sourceData = Object.assign(Object.assign({}, formOptions.sourceData), { urls: formOptions.dialogOptions.sourceData.urls.map((urlObject) => {

package/lib/{formbuilder → shared/formbuilder}/objectform/schemaUtils.d.ts

@@ -4,11 +4,13 @@
  * and apply read-only behaviour based on form context (create vs update).
  */
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
-import { IDict } from "../../types";
+import { IDict } from "../../../types";
 /**
  * Remove a property from form data, schema, and uiSchema.
  */
 export declare function removeFormEntry(entry: string, data: IDict | undefined, schema: RJSFSchema, uiSchema: UiSchema): void;
+/** Remove a property nested under a parent object in data, schema, and uiSchema. */
+export declare function removeNestedFormEntry(parentKey: string, entry: string, data: IDict | undefined, schema: RJSFSchema, uiSchema: UiSchema): void;
 /**
  * Apply base processSchema: array options, opacity field, readOnly handling.
  * Mutates schema, uiSchema, and optionally data (for readOnly removal in update).

package/lib/{formbuilder → shared/formbuilder}/objectform/schemaUtils.js

@@ -13,6 +13,17 @@ export function removeFormEntry(entry, data, schema, uiSchema) {
         schema.required.splice(schema.required.indexOf(entry), 1);
     }
 }
+/** Remove a property nested under a parent object in data, schema, and uiSchema. */
+export function removeNestedFormEntry(parentKey, entry, data, schema, uiSchema) {
+    var _a, _b;
+    const parentData = data && typeof data[parentKey] === 'object'
+        ? data[parentKey]
+        : undefined;
+    const parentSchema = (_a = schema.properties) === null || _a === void 0 ? void 0 : _a[parentKey];
+    const parentUiSchema = (_b = uiSchema[parentKey]) !== null && _b !== void 0 ? _b : {};
+    removeFormEntry(entry, parentData, parentSchema, parentUiSchema);
+    uiSchema[parentKey] = parentUiSchema;
+}
 /**
  * Apply base processSchema: array options, opacity field, readOnly handling.
  * Mutates schema, uiSchema, and optionally data (for readOnly removal in update).

package/lib/{formbuilder → shared/formbuilder}/objectform/useSchemaFormState.d.ts

@@ -7,7 +7,7 @@
 import { IJupyterGISModel } from '@jupytergis/schema';
 import { RJSFSchema } from '@rjsf/utils';
 import { type Dispatch, type SetStateAction } from 'react';
-import { IDict } from "../../types";
+import { IDict } from "../../../types";
 export interface IUseSchemaFormStateProps {
     /** External data to sync into the form (e.g. layer/source parameters). */
     sourceData: IDict | undefined;

package/lib/{formbuilder → shared/formbuilder}/objectform/useSchemaFormState.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useState, } from 'react';
-import { deepCopy } from "../../tools";
+import { deepCopy } from "../../../tools";
 /**
  * Manages form data state, schema copy, and form context for object forms.
  * Callers supply uiSchema, handleChange, handleSubmit, and any validation.

package/lib/{icons.d.ts → shared/icons.d.ts}

@@ -16,4 +16,6 @@ export declare const terminalToolbarIcon: LabIcon;
 export declare const geolocationIcon: LabIcon;
 export declare const targetWithoutCenterIcon: LabIcon;
 export declare const targetWithCenterIcon: LabIcon;
+export declare const geoPackageIcon: LabIcon;
 export declare const markerIcon: LabIcon;
+export declare const pencilSolidIcon: LabIcon;

package/lib/{icons.js → shared/icons.js}

@@ -4,24 +4,26 @@
  */
 // This file is based on iconimports.ts in @jupyterlab/ui-components, but is manually generated.
 import { LabIcon } from '@jupyterlab/ui-components';
-import bookOpenSvgStr from '../style/icons/book_open.svg';
-import clockSvgStr from '../style/icons/clock-solid.svg';
-import geoJsonSvgStr from '../style/icons/geojson.svg';
-import geolocationSvgStr from '../style/icons/geolocation.svg';
-import infoSvgStr from '../style/icons/info-solid.svg';
-import logoSvgStr from '../style/icons/logo.svg';
-import logoMiniSvgStr from '../style/icons/logo_mini.svg';
-import logoMiniAlternativeSvgStr from '../style/icons/logo_mini_alternative.svg';
-import logoMiniQGZ from '../style/icons/logo_mini_qgz.svg';
-import markerSvgStr from '../style/icons/marker.svg';
-import moundSvgStr from '../style/icons/mound.svg';
-import nonVisibilitySvgStr from '../style/icons/nonvisibility.svg';
-import rasterSvgStr from '../style/icons/raster.svg';
-import targetWithCenterSvgStr from '../style/icons/target_with_center.svg';
-import targetWithoutCenterSvgStr from '../style/icons/target_without_center.svg';
-import terminalToolbarSvgStr from '../style/icons/terminal_toolbar.svg';
-import vectorSquareSvgStr from '../style/icons/vector_square.svg';
-import visibilitySvgStr from '../style/icons/visibility.svg';
+import bookOpenSvgStr from '../../style/icons/book_open.svg';
+import clockSvgStr from '../../style/icons/clock-solid.svg';
+import geoJsonSvgStr from '../../style/icons/geojson.svg';
+import geolocationSvgStr from '../../style/icons/geolocation.svg';
+import geoPackageSvgStr from '../../style/icons/geopackage.svg';
+import infoSvgStr from '../../style/icons/info-solid.svg';
+import logoSvgStr from '../../style/icons/logo.svg';
+import logoMiniSvgStr from '../../style/icons/logo_mini.svg';
+import logoMiniAlternativeSvgStr from '../../style/icons/logo_mini_alternative.svg';
+import logoMiniQGZ from '../../style/icons/logo_mini_qgz.svg';
+import markerSvgStr from '../../style/icons/marker.svg';
+import moundSvgStr from '../../style/icons/mound.svg';
+import nonVisibilitySvgStr from '../../style/icons/nonvisibility.svg';
+import pencilSolidSvgStr from '../../style/icons/pencil_solid.svg';
+import rasterSvgStr from '../../style/icons/raster.svg';
+import targetWithCenterSvgStr from '../../style/icons/target_with_center.svg';
+import targetWithoutCenterSvgStr from '../../style/icons/target_without_center.svg';
+import terminalToolbarSvgStr from '../../style/icons/terminal_toolbar.svg';
+import vectorSquareSvgStr from '../../style/icons/vector_square.svg';
+import visibilitySvgStr from '../../style/icons/visibility.svg';
 export const logoIcon = new LabIcon({
     name: 'jupytergis::logo',
     svgstr: logoSvgStr,
@@ -90,7 +92,15 @@ export const targetWithCenterIcon = new LabIcon({
     name: 'jupytergis::targetWithoutCenter',
     svgstr: targetWithoutCenterSvgStr,
 });
+export const geoPackageIcon = new LabIcon({
+    name: 'jupytergis::geoPackage',
+    svgstr: geoPackageSvgStr,
+});
 export const markerIcon = new LabIcon({
     name: 'jupytergis::marker',
     svgstr: markerSvgStr,
 });
+export const pencilSolidIcon = new LabIcon({
+    name: 'jupytergis::pencilSolid',
+    svgstr: pencilSolidSvgStr,
+});

package/lib/tools.d.ts

@@ -78,6 +78,7 @@ export declare const loadGeoTiff: (sourceInfo: {
     sourceUrl: string;
     metadata?: undefined;
 } | null>;
+export declare function getGeoPackageTableNames(filepath: string, type: 'GeoPackageVectorSource' | 'GeoPackageRasterSource'): Promise<string[]>;
 /**
  * Generalized file reader for different source types.
  *
@@ -100,6 +101,7 @@ export declare const base64ToBlob: (base64: string, mimeType: string) => Promise
 /**
  * A mapping of file extensions to their corresponding MIME types.
  */
+export declare const INTERNAL_PROXY_BASE = "/jupytergis_core/proxy";
 export declare const MIME_TYPES: {
     [ext: string]: string;
 };