@jupyterlab/settingeditor 4.0.0-alpha.3 → 4.0.0-alpha.6

package/lib/SettingsFormEditor.d.ts

@@ -0,0 +1,83 @@
+import { Settings } from '@jupyterlab/settingregistry';
+import { ITranslator } from '@jupyterlab/translation';
+import { Field } from '@rjsf/core';
+import React from 'react';
+import { PluginList } from './pluginlist';
+/**
+ * Namespace for a React component that prepares the settings for a
+ * given plugin to be rendered in the FormEditor.
+ */
+export declare namespace SettingsFormEditor {
+    /**
+     * Props passed to the SettingsFormEditor component
+     */
+    interface IProps {
+        /**
+         * Settings object with schema and user defined values.
+         */
+        settings: Settings;
+        /**
+         * Dictionary used for custom field renderers in the form.
+         */
+        renderers: {
+            [id: string]: Field;
+        };
+        /**
+         * Whether the form is collapsed or not.
+         */
+        isCollapsed: boolean;
+        /**
+         * Callback with the collapse state value.
+         */
+        onCollapseChange: (v: boolean) => void;
+        /**
+         * Translator object
+         */
+        translator: ITranslator;
+        /**
+         * Callback to update the plugin list when a validation error occurs.
+         */
+        hasError: (error: boolean) => void;
+        /**
+         * Handler for when selection change is triggered by scrolling
+         * in the SettingsPanel.
+         */
+        onSelect: (id: string) => void;
+        /**
+         * Sends whether this editor has unsaved changes to the parent class.
+         */
+        updateDirtyState: (dirty: boolean) => void;
+    }
+    interface IState {
+        /**
+         * The current form values being displayed in the editor.
+         */
+        formData: any;
+        /**
+         * Indicates whether the settings have been modified. Used for hiding
+         * the "Restore to Default" button when there are no changes.
+         */
+        isModified: boolean;
+    }
+}
+/**
+ * A React component that prepares the settings for a
+ * given plugin to be rendered in the FormEditor.
+ */
+export declare class SettingsFormEditor extends React.Component<SettingsFormEditor.IProps, SettingsFormEditor.IState> {
+    constructor(props: SettingsFormEditor.IProps);
+    /**
+     * Handler for edits made in the form editor.
+     * @param data - Form data sent from the form editor
+     */
+    handleChange(): void;
+    /**
+     * Handler for the "Restore to defaults" button - clears all
+     * modified settings then calls `setFormData` to restore the
+     * values.
+     */
+    reset: () => Promise<void>;
+    render(): JSX.Element;
+    protected onSelect: (list: PluginList, id: string) => void;
+    private _debouncer;
+}

package/lib/SettingsFormEditor.js

@@ -0,0 +1,206 @@
+/* -----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+import { showErrorMessage } from '@jupyterlab/apputils';
+import { caretDownIcon, caretRightIcon } from '@jupyterlab/ui-components';
+import { reduce } from '@lumino/algorithm';
+import { JSONExt } from '@lumino/coreutils';
+import { Debouncer } from '@lumino/polling';
+import Form, { utils } from '@rjsf/core';
+import React from 'react';
+/**
+ * Indentation to use when saving the settings as JSON document.
+ */
+const JSON_INDENTATION = 4;
+/**
+ * Template to allow for custom buttons to re-order/remove entries in an array.
+ * Necessary to create accessible buttons.
+ */
+const CustomArrayTemplateFactory = (translator) => {
+    const trans = translator.load('jupyterlab');
+    const factory = (props) => {
+        var _a;
+        return (React.createElement("div", { className: props.className },
+            React.createElement(props.TitleField, { title: props.title, required: props.required, id: `${props.idSchema.$id}-title` }),
+            React.createElement(props.DescriptionField, { id: `${props.idSchema.$id}-description`, description: (_a = props.schema.description) !== null && _a !== void 0 ? _a : '' }),
+            props.items.map(item => {
+                return (React.createElement("div", { key: item.key, className: item.className },
+                    item.children,
+                    React.createElement("div", { className: "jp-ArrayOperations" },
+                        React.createElement("button", { className: "jp-mod-styled jp-mod-reject", onClick: item.onReorderClick(item.index, item.index - 1), disabled: !item.hasMoveUp }, trans.__('Move Up')),
+                        React.createElement("button", { className: "jp-mod-styled jp-mod-reject", onClick: item.onReorderClick(item.index, item.index + 1), disabled: !item.hasMoveDown }, trans.__('Move Down')),
+                        React.createElement("button", { className: "jp-mod-styled jp-mod-warn", onClick: item.onDropIndexClick(item.index), disabled: !item.hasRemove }, trans.__('Remove')))));
+            }),
+            props.canAdd && (React.createElement("button", { className: "jp-mod-styled jp-mod-reject", onClick: props.onAddClick }, trans.__('Add')))));
+    };
+    factory.displayName = 'CustomArrayTemplate';
+    return factory;
+};
+/**
+ * Template with custom add button, necessary for accessiblity and internationalization.
+ */
+const CustomObjectTemplateFactory = (translator) => {
+    const trans = translator.load('jupyterlab');
+    const factory = (props) => {
+        const { TitleField, DescriptionField } = props;
+        return (React.createElement("fieldset", { id: props.idSchema.$id },
+            (props.uiSchema['ui:title'] || props.title) && (React.createElement(TitleField, { id: `${props.idSchema.$id}__title`, title: props.title || props.uiSchema['ui:title'], required: props.required })),
+            props.description && (React.createElement(DescriptionField, { id: `${props.idSchema.$id}__description`, description: props.description })),
+            props.properties.map(property => property.content),
+            utils.canExpand(props.schema, props.uiSchema, props.formData) && (React.createElement("button", { className: "jp-mod-styled jp-mod-reject", onClick: props.onAddClick(props.schema), disabled: props.disabled || props.readonly }, trans.__('Add')))));
+    };
+    factory.displayName = 'CustomObjectTemplate';
+    return factory;
+};
+/**
+ * Renders the modified indicator and errors
+ */
+const CustomTemplate = (props) => {
+    const { formData, schema, label, displayLabel, id, formContext, errors, rawErrors, children, onKeyChange, onDropPropertyClick } = props;
+    /**
+     * Determine if the field has been modified
+     * Schema Id is formatted as 'root_<field name>.<nexted field name>'
+     * This logic parses out the field name to find the default value
+     * before determining if the field has been modified.
+     */
+    const schemaIds = id.split('_');
+    schemaIds.shift();
+    const schemaId = schemaIds.join('.');
+    let defaultValue;
+    if (schemaIds.length === 1) {
+        defaultValue = formContext.settings.default(schemaId);
+    }
+    else if (schemaIds.length > 1) {
+        const allDefaultsForObject = {};
+        allDefaultsForObject[schemaIds[0]] = formContext.settings.default(schemaIds[0]);
+        defaultValue = reduce(schemaIds, (acc, val, i) => {
+            return acc === null || acc === void 0 ? void 0 : acc[val];
+        }, allDefaultsForObject);
+    }
+    const isModified = schemaId !== '' &&
+        formData !== undefined &&
+        defaultValue !== undefined &&
+        !schema.properties &&
+        schema.type !== 'array' &&
+        !JSONExt.deepEqual(formData, defaultValue);
+    const isRoot = schemaId === '';
+    const needsDescription = !isRoot &&
+        schema.type != 'object' &&
+        id !=
+            'jp-SettingsEditor-@jupyterlab/shortcuts-extension:shortcuts_shortcuts';
+    // While we can implement "remove" button for array items in array template,
+    // object templates do not provide a way to do this; instead we need to add
+    // buttons here (and first check if the field can be removed = is additional).
+    const isAdditional = schema.hasOwnProperty(utils.ADDITIONAL_PROPERTY_FLAG);
+    return (React.createElement("div", { className: `form-group ${displayLabel || schema.type === 'boolean' ? 'small-field' : ''}` },
+        // Only show the modified indicator if there are no errors
+        isModified && !rawErrors && React.createElement("div", { className: "jp-modifiedIndicator" }),
+        // Shows a red indicator for fields that have validation errors
+        rawErrors && React.createElement("div", { className: "jp-modifiedIndicator jp-errorIndicator" }),
+        React.createElement("div", { className: "jp-FormGroup-content" },
+            displayLabel && !isRoot && label && !isAdditional && (React.createElement("h3", { className: "jp-FormGroup-fieldLabel jp-FormGroup-contentItem" }, label)),
+            isAdditional && (React.createElement("input", { className: "jp-FormGroup-contentItem jp-mod-styled", type: "text", onBlur: event => onKeyChange(event.target.value), defaultValue: label })),
+            React.createElement("div", { className: `${isRoot
+                    ? 'jp-root'
+                    : schema.type === 'object'
+                        ? 'jp-objectFieldWrapper'
+                        : 'jp-inputFieldWrapper jp-FormGroup-contentItem'}` }, children),
+            isAdditional && (React.createElement("button", { className: "jp-FormGroup-contentItem jp-mod-styled jp-mod-warn jp-FormGroup-removeButton", onClick: onDropPropertyClick(label) }, 'Remove')),
+            schema.description && needsDescription && (React.createElement("div", { className: "jp-FormGroup-description" }, schema.description)),
+            React.createElement("div", { className: "validationErrors" }, errors))));
+};
+/**
+ * A React component that prepares the settings for a
+ * given plugin to be rendered in the FormEditor.
+ */
+export class SettingsFormEditor extends React.Component {
+    constructor(props) {
+        super(props);
+        /**
+         * Handler for the "Restore to defaults" button - clears all
+         * modified settings then calls `setFormData` to restore the
+         * values.
+         */
+        this.reset = async () => {
+            for (const field in this.props.settings.user) {
+                await this.props.settings.remove(field);
+            }
+            this.setState({
+                formData: this.props.settings.composite,
+                isModified: false
+            });
+        };
+        this.onSelect = (list, id) => {
+            if (id === this.props.settings.id) {
+                this.props.onCollapseChange(false);
+            }
+        };
+        const { settings } = props;
+        this.state = {
+            formData: settings.composite,
+            isModified: settings.isModified
+        };
+        this.handleChange = this.handleChange.bind(this);
+        this._debouncer = new Debouncer(this.handleChange);
+    }
+    /**
+     * Handler for edits made in the form editor.
+     * @param data - Form data sent from the form editor
+     */
+    handleChange() {
+        // Prevent unnecessary save when opening settings that haven't been modified.
+        if (!this.props.settings.isModified &&
+            this.props.settings.isDefault(this.state.formData)) {
+            this.props.updateDirtyState(false);
+            return;
+        }
+        this.props.settings
+            .save(JSON.stringify(this.state.formData, undefined, JSON_INDENTATION))
+            .then(() => {
+            this.props.updateDirtyState(false);
+            this.setState({ isModified: this.props.settings.isModified });
+        })
+            .catch((reason) => {
+            this.props.updateDirtyState(false);
+            const trans = this.props.translator.load('jupyterlab');
+            showErrorMessage(trans.__('Error saving settings.'), reason);
+        });
+    }
+    render() {
+        var _a;
+        const trans = this.props.translator.load('jupyterlab');
+        /**
+         * Construct uiSchema to pass any custom renderers to the form editor.
+         */
+        const uiSchema = {};
+        for (const id in this.props.renderers) {
+            if (Object.keys((_a = this.props.settings.schema.properties) !== null && _a !== void 0 ? _a : {}).includes(id)) {
+                uiSchema[id] = {
+                    'ui:field': id
+                };
+            }
+        }
+        const icon = this.props.isCollapsed ? caretRightIcon : caretDownIcon;
+        return (React.createElement("div", null,
+            React.createElement("div", { className: "jp-SettingsHeader", onClick: () => {
+                    this.props.onCollapseChange(!this.props.isCollapsed);
+                    this.props.onSelect(this.props.settings.id);
+                } },
+                React.createElement("header", { className: "jp-SettingsTitle" },
+                    React.createElement(icon.react, { tag: "span", elementPosition: "center", className: "jp-SettingsTitle-caret" }),
+                    React.createElement("h2", null, this.props.settings.schema.title),
+                    React.createElement("div", { className: "jp-SettingsHeader-description" }, this.props.settings.schema.description)),
+                this.state.isModified && (React.createElement("button", { className: "jp-RestoreButton", onClick: this.reset }, trans.__('Restore to Defaults')))),
+            !this.props.isCollapsed && (React.createElement(Form, { schema: this.props.settings.schema, formData: this.state.formData, FieldTemplate: CustomTemplate, ArrayFieldTemplate: CustomArrayTemplateFactory(this.props.translator), ObjectFieldTemplate: CustomObjectTemplateFactory(this.props.translator), uiSchema: uiSchema, fields: this.props.renderers, formContext: { settings: this.props.settings }, liveValidate: true, idPrefix: `jp-SettingsEditor-${this.props.settings.id}`, onChange: (e) => {
+                    this.props.hasError(e.errors.length !== 0);
+                    this.setState({ formData: e.formData });
+                    if (e.errors.length === 0) {
+                        this.props.updateDirtyState(true);
+                        void this._debouncer.invoke();
+                    }
+                    this.props.onSelect(this.props.settings.id);
+                } }))));
+    }
+}
+//# sourceMappingURL=SettingsFormEditor.js.map

package/lib/SettingsFormEditor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SettingsFormEditor.js","sourceRoot":"","sources":["../src/SettingsFormEditor.tsx"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -2,5 +2,6 @@
  * @packageDocumentation
  * @module settingeditor
  */
-export * from './settingeditor';
+export * from './settingseditor';
+export * from './jsonsettingeditor';
 export * from './tokens';

package/lib/index.js

@@ -4,6 +4,7 @@
  * @packageDocumentation
  * @module settingeditor
  */
-export * from './settingeditor';
+export * from './settingseditor';
+export * from './jsonsettingeditor';
 export * from './tokens';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAEH,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAC3D;;;GAGG;AAEH,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC"}

package/lib/inspector.js

@@ -42,9 +42,8 @@ class InspectorConnector extends DataConnector {
     constructor(editor, translator) {
         super();
         this._current = 0;
-        this.translator = translator || nullTranslator;
         this._editor = editor;
-        this._trans = this.translator.load('jupyterlab');
+        this._trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
     }
     /**
      * Fetch inspection requests.
@@ -63,50 +62,45 @@ class InspectorConnector extends DataConnector {
                         metadata: {}
                     });
                 }
-                resolve({ data: Private.render(errors), metadata: {} });
+                resolve({ data: this.render(errors), metadata: {} });
             }, 100));
         });
     }
-    _validate(raw) {
-        const editor = this._editor;
-        if (!editor.settings) {
-            return null;
-        }
-        const { id, schema, version } = editor.settings;
-        const data = { composite: {}, user: {} };
-        const validator = editor.registry.validator;
-        return validator.validateData({ data, id, raw, schema, version }, false);
-    }
-}
-/**
- * A namespace for private module data.
- */
-var Private;
-(function (Private) {
     /**
      * Render validation errors as an HTML string.
      */
-    function render(errors) {
-        return { 'text/markdown': errors.map(renderError).join('') };
+    render(errors) {
+        return {
+            'text/markdown': errors.map(this.renderError.bind(this)).join('')
+        };
     }
-    Private.render = render;
     /**
      * Render an individual validation error as a markdown string.
      */
-    function renderError(error) {
+    renderError(error) {
         var _a;
         switch (error.keyword) {
             case 'additionalProperties':
-                return `**\`[additional property error]\`**
-          \`${(_a = error.params) === null || _a === void 0 ? void 0 : _a.additionalProperty}\` is not a valid property`;
+                return `**\`[${this._trans.__('additional property error')}]\`**
+          ${this._trans.__('`%1` is not a valid property', (_a = error.params) === null || _a === void 0 ? void 0 : _a.additionalProperty)}`;
             case 'syntax':
-                return `**\`[syntax error]\`** *${error.message}*`;
+                return `**\`[${this._trans.__('syntax error')}]\`** *${error.message}*`;
             case 'type':
-                return `**\`[type error]\`**
+                return `**\`[${this._trans.__('type error')}]\`**
           \`${error.dataPath}\` ${error.message}`;
             default:
-                return `**\`[error]\`** *${error.message}*`;
+                return `**\`[${this._trans.__('error')}]\`** *${error.message}*`;
+        }
+    }
+    _validate(raw) {
+        const editor = this._editor;
+        if (!editor.settings) {
+            return null;
         }
+        const { id, schema, version } = editor.settings;
+        const data = { composite: {}, user: {} };
+        const validator = editor.registry.validator;
+        return validator.validateData({ data, id, raw, schema, version }, false);
     }
-})(Private || (Private = {}));
+}
 //# sourceMappingURL=inspector.js.map

package/lib/inspector.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspector.js","sourceRoot":"","sources":["../src/inspector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inspector.js","sourceRoot":"","sources":["../src/inspector.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAE/E,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAEL,kBAAkB,EAClB,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAEL,cAAc,EAEf,MAAM,yBAAyB,CAAC;AAIjC;;GAEG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAiB,EACjB,UAAgC,EAChC,UAAwB;IAExB,UAAU,GAAG,UAAU,IAAI,cAAc,CAAC;IAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC;QACnC,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,gCAAgC,CAAC;QAC1D,UAAU,EAAE,UAAU;KACvB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC;QACpC,SAAS;QACT,UAAU,EACR,UAAU;YACV,IAAI,kBAAkB,CAAC;gBACrB,gBAAgB,EAAE,yBAAyB;gBAC3C,UAAU,EAAE,UAAU;aACvB,CAAC;KACL,CAAC,CAAC;IAEH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACvC,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC;IAC3B,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,kBAAmB,SAAQ,aAIhC;IACC,YAAY,MAAiB,EAAE,UAAwB;QACrD,KAAK,EAAE,CAAC;QA0EF,aAAQ,GAAG,CAAC,CAAC;QAzEnB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,cAAc,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACH,KAAK,CACH,OAAmC;QAEnC,OAAO,IAAI,OAAO,CAAuC,OAAO,CAAC,EAAE;YACjE,wCAAwC;YACxC,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBACtD,IAAI,OAAO,KAAK,IAAI,CAAC,QAAQ,EAAE;oBAC7B,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC3B;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE5C,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,OAAO,CAAC;wBACb,IAAI,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE;wBAC5D,QAAQ,EAAE,EAAE;qBACb,CAAC,CAAC;iBACJ;gBAED,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACvD,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;IACD;;OAEG;IACO,MAAM,CAAC,MAAiC;QAChD,OAAO;YACL,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;SAClE,CAAC;IACJ,CAAC;IAED;;OAEG;IACO,WAAW,CAAC,KAA8B;;QAClD,QAAQ,KAAK,CAAC,OAAO,EAAE;YACrB,KAAK,sBAAsB;gBACzB,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,EAAE,CACd,8BAA8B,EAC9B,MAAA,KAAK,CAAC,MAAM,0CAAE,kBAAkB,CACjC,EAAE,CAAC;YACR,KAAK,QAAQ;gBACX,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC,UAAU,KAAK,CAAC,OAAO,GAAG,CAAC;YAC1E,KAAK,MAAM;gBACT,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;cACrC,KAAK,CAAC,QAAQ,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;YAC5C;gBACE,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,CAAC,OAAO,GAAG,CAAC;SACpE;IACH,CAAC;IAEO,SAAS,CAAC,GAAW;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChD,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;QAE5C,OAAO,SAAS,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;CAKF"}

package/lib/{settingeditor.d.ts → jsonsettingeditor.d.ts}

@@ -7,15 +7,15 @@ import { CommandRegistry } from '@lumino/commands';
 import { JSONObject } from '@lumino/coreutils';
 import { Message } from '@lumino/messaging';
 import { ISignal } from '@lumino/signaling';
-import { Widget } from '@lumino/widgets';
+import { SplitPanel } from './splitpanel';
 /**
  * An interface for modifying and saving application settings.
  */
-export declare class SettingEditor extends Widget {
+export declare class JsonSettingEditor extends SplitPanel {
     /**
      * Create a new setting editor.
      */
-    constructor(options: SettingEditor.IOptions);
+    constructor(options: JsonSettingEditor.IOptions);
     /**
      * The state database key for the editor's state management.
      */
@@ -93,15 +93,14 @@ export declare class SettingEditor extends Widget {
     private _fetching;
     private _instructions;
     private _list;
-    private _panel;
     private _saving;
     private _state;
     private _when;
 }
 /**
- * A namespace for `SettingEditor` statics.
+ * A namespace for `JsonSettingEditor` statics.
  */
-export declare namespace SettingEditor {
+export declare namespace JsonSettingEditor {
     /**
      * The instantiation options for a setting editor.
      */

package/lib/{settingeditor.js → jsonsettingeditor.js}

@@ -3,11 +3,9 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 import { nullTranslator } from '@jupyterlab/translation';
-import { jupyterIcon } from '@jupyterlab/ui-components';
+import { jupyterIcon, ReactWidget } from '@jupyterlab/ui-components';
 import { JSONExt } from '@lumino/coreutils';
-import { PanelLayout, Widget } from '@lumino/widgets';
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 import { PluginEditor } from './plugineditor';
 import { PluginList } from './pluginlist';
 import { SplitPanel } from './splitpanel';
@@ -25,28 +23,32 @@ const DEFAULT_LAYOUT = {
 /**
  * An interface for modifying and saving application settings.
  */
-export class SettingEditor extends Widget {
+export class JsonSettingEditor extends SplitPanel {
     /**
      * Create a new setting editor.
      */
     constructor(options) {
-        super();
+        super({
+            orientation: 'horizontal',
+            renderer: SplitPanel.defaultRenderer,
+            spacing: 1
+        });
         this._fetching = null;
         this._saving = false;
         this._state = JSONExt.deepCopy(DEFAULT_LAYOUT);
         this.translator = options.translator || nullTranslator;
+        const trans = this.translator.load('jupyterlab');
         this.addClass('jp-SettingEditor');
         this.key = options.key;
         this.state = options.state;
         const { commands, editorFactory, rendermime } = options;
-        const layout = (this.layout = new PanelLayout());
         const registry = (this.registry = options.registry);
-        const panel = (this._panel = new SplitPanel({
-            orientation: 'horizontal',
-            renderer: SplitPanel.defaultRenderer,
-            spacing: 1
-        }));
-        const instructions = (this._instructions = new Widget());
+        const instructions = (this._instructions = ReactWidget.create(React.createElement(React.Fragment, null,
+            React.createElement("h2", null,
+                React.createElement(jupyterIcon.react, { className: "jp-SettingEditorInstructions-icon", tag: "span", elementPosition: "center", height: "auto", width: "60px" }),
+                React.createElement("span", { className: "jp-SettingEditorInstructions-title" }, trans.__('Settings'))),
+            React.createElement("span", { className: "jp-SettingEditorInstructions-text" }, trans.__('Select a plugin from the list to view and edit its preferences.')))));
+        instructions.addClass('jp-SettingEditorInstructions');
         const editor = (this._editor = new PluginEditor({
             commands,
             editorFactory,
@@ -61,21 +63,17 @@ export class SettingEditor extends Widget {
             translator: this.translator
         }));
         const when = options.when;
-        instructions.addClass('jp-SettingEditorInstructions');
-        Private.populateInstructionsNode(instructions.node, this.translator);
         if (when) {
             this._when = Array.isArray(when) ? Promise.all(when) : when;
         }
-        panel.addClass('jp-SettingEditor-main');
-        layout.addWidget(panel);
-        panel.addWidget(list);
-        panel.addWidget(instructions);
+        this.addWidget(list);
+        this.addWidget(instructions);
         SplitPanel.setStretch(list, 0);
         SplitPanel.setStretch(instructions, 1);
         SplitPanel.setStretch(editor, 1);
         editor.stateChanged.connect(this._onStateChanged, this);
         list.changed.connect(this._onStateChanged, this);
-        panel.handleMoved.connect(this._onStateChanged, this);
+        this.handleMoved.connect(this._onStateChanged, this);
     }
     /**
      * Whether the raw editor revert functionality is enabled.
@@ -118,7 +116,6 @@ export class SettingEditor extends Widget {
         this._editor.dispose();
         this._instructions.dispose();
         this._list.dispose();
-        this._panel.dispose();
     }
     /**
      * Revert raw editor back to original settings.
@@ -137,15 +134,15 @@ export class SettingEditor extends Widget {
      */
     onAfterAttach(msg) {
         super.onAfterAttach(msg);
-        this._panel.hide();
+        this.hide();
         this._fetchState()
             .then(() => {
-            this._panel.show();
+            this.show();
             this._setState();
         })
             .catch(reason => {
             console.error('Fetching setting editor state failed', reason);
-            this._panel.show();
+            this.show();
             this._setState();
         });
     }
@@ -184,7 +181,7 @@ export class SettingEditor extends Widget {
      * Handle root level layout state changes.
      */
     async _onStateChanged() {
-        this._state.sizes = this._panel.relativeSizes();
+        this._state.sizes = this.relativeSizes();
         this._state.container = this._editor.state;
         this._state.container.plugin = this._list.selection;
         try {
@@ -216,13 +213,12 @@ export class SettingEditor extends Widget {
      */
     _setLayout() {
         const editor = this._editor;
-        const panel = this._panel;
         const state = this._state;
         editor.state = state.container;
         // Allow the message queue (which includes fit requests that might disrupt
         // setting relative sizes) to clear before setting sizes.
         requestAnimationFrame(() => {
-            panel.setRelativeSizes(state.sizes);
+            this.setRelativeSizes(state.sizes);
         });
     }
     /**
@@ -231,7 +227,6 @@ export class SettingEditor extends Widget {
     _setState() {
         const editor = this._editor;
         const list = this._list;
-        const panel = this._panel;
         const { container } = this._state;
         if (!container.plugin) {
             editor.settings = null;
@@ -251,7 +246,7 @@ export class SettingEditor extends Widget {
                 instructions.parent = null;
             }
             if (!editor.isAttached) {
-                panel.addWidget(editor);
+                this.addWidget(editor);
             }
             editor.settings = settings;
             list.selection = container.plugin;
@@ -270,19 +265,6 @@ export class SettingEditor extends Widget {
  */
 var Private;
 (function (Private) {
-    /**
-     * Populate the instructions text node.
-     */
-    function populateInstructionsNode(node, translator) {
-        translator = translator || nullTranslator;
-        const trans = translator.load('jupyterlab');
-        ReactDOM.render(React.createElement(React.Fragment, null,
-            React.createElement("h2", null,
-                React.createElement(jupyterIcon.react, { className: "jp-SettingEditorInstructions-icon", tag: "span", elementPosition: "center", height: "auto", width: "60px" }),
-                React.createElement("span", { className: "jp-SettingEditorInstructions-title" }, "Settings")),
-            React.createElement("span", { className: "jp-SettingEditorInstructions-text" }, trans.__('Select a plugin from the list to view and edit its preferences.'))), node);
-    }
-    Private.populateInstructionsNode = populateInstructionsNode;
     /**
      * Return a normalized restored layout state that defaults to the presets.
      */
@@ -320,4 +302,4 @@ var Private;
         return Array.isArray(value) && value.every(x => typeof x === 'number');
     }
 })(Private || (Private = {}));
-//# sourceMappingURL=settingeditor.js.map
+//# sourceMappingURL=jsonsettingeditor.js.map