@jupyterlab/settingeditor 4.0.0-alpha.17 → 4.0.0-alpha.19

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.
@@ -1,8 +1,7 @@
1
1
  import { ISettingRegistry, Settings } from '@jupyterlab/settingregistry';
2
2
  import { ITranslator } from '@jupyterlab/translation';
3
- import { ArrayFieldTemplateProps, Field, FieldTemplateProps, ObjectFieldTemplateProps, UiSchema } from '@rjsf/core';
3
+ import { Field, UiSchema } from '@rjsf/utils';
4
4
  import React from 'react';
5
- import { PluginList } from './pluginlist';
6
5
  /**
7
6
  * Namespace for a React component that prepares the settings for a
8
7
  * given plugin to be rendered in the FormEditor.
@@ -20,7 +19,9 @@ export declare namespace SettingsFormEditor {
20
19
  * Dictionary used for custom field renderers in the form.
21
20
  */
22
21
  renderers: {
23
- [id: string]: Field;
22
+ [id: string]: {
23
+ [property: string]: Field;
24
+ };
24
25
  };
25
26
  /**
26
27
  * Whether the form is collapsed or not.
@@ -66,18 +67,6 @@ export declare namespace SettingsFormEditor {
66
67
  * Filtered schema
67
68
  */
68
69
  filteredSchema?: ISettingRegistry.ISchema;
69
- /**
70
- * Field template
71
- */
72
- fieldTemplate?: React.StatelessComponent<FieldTemplateProps<any>>;
73
- /**
74
- * Array Field template
75
- */
76
- arrayFieldTemplate?: React.StatelessComponent<ArrayFieldTemplateProps<any>>;
77
- /**
78
- * Object Field template
79
- */
80
- objectFieldTemplate?: React.StatelessComponent<ObjectFieldTemplateProps<any>>;
81
70
  /**
82
71
  * Form context
83
72
  */
@@ -105,16 +94,9 @@ export declare class SettingsFormEditor extends React.Component<SettingsFormEdit
105
94
  */
106
95
  reset: (event: React.MouseEvent) => Promise<void>;
107
96
  render(): JSX.Element;
108
- /**
109
- * Callback on plugin selection
110
- * @param list Plugin list
111
- * @param id Plugin id
112
- */
113
- protected onSelect: (list: PluginList, id: string) => void;
114
97
  private _onChange;
115
98
  private _setUiSchema;
116
99
  private _setFilteredSchema;
117
100
  private _debouncer;
118
101
  private _formData;
119
- private _templateFactory;
120
102
  }
@@ -3,10 +3,10 @@
3
3
  | Distributed under the terms of the Modified BSD License.
4
4
  |----------------------------------------------------------------------------*/
5
5
  import { showErrorMessage } from '@jupyterlab/apputils';
6
- import { caretDownIcon, caretRightIcon, RJSFTemplatesFactory } from '@jupyterlab/ui-components';
6
+ import { caretDownIcon, caretRightIcon, FormComponent } from '@jupyterlab/ui-components';
7
7
  import { JSONExt } from '@lumino/coreutils';
8
8
  import { Debouncer } from '@lumino/polling';
9
- import Form from '@rjsf/core';
9
+ import validatorAjv8 from '@rjsf/validator-ajv8';
10
10
  import React from 'react';
11
11
  /**
12
12
  * Indentation to use when saving the settings as JSON document.
@@ -32,16 +32,6 @@ export class SettingsFormEditor extends React.Component {
32
32
  this._formData = this.props.settings.composite;
33
33
  this.setState({ isModified: false });
34
34
  };
35
- /**
36
- * Callback on plugin selection
37
- * @param list Plugin list
38
- * @param id Plugin id
39
- */
40
- this.onSelect = (list, id) => {
41
- if (id === this.props.settings.id) {
42
- this.props.onCollapseChange(false);
43
- }
44
- };
45
35
  this._onChange = (e) => {
46
36
  this.props.hasError(e.errors.length !== 0);
47
37
  this._formData = e.formData;
@@ -53,18 +43,14 @@ export class SettingsFormEditor extends React.Component {
53
43
  };
54
44
  const { settings } = props;
55
45
  this._formData = settings.composite;
56
- this._templateFactory = new RJSFTemplatesFactory({
57
- translator: this.props.translator,
58
- showModifiedFromDefault: true
59
- });
60
46
  this.state = {
61
47
  isModified: settings.isModified,
62
48
  uiSchema: {},
63
49
  filteredSchema: this.props.settings.schema,
64
- fieldTemplate: this._templateFactory.fieldTemplate,
65
- arrayFieldTemplate: this._templateFactory.arrayTemplate,
66
- objectFieldTemplate: this._templateFactory.objectTemplate,
67
- formContext: { settings: this.props.settings }
50
+ formContext: {
51
+ defaultFormData: this.props.settings.default(),
52
+ settings: this.props.settings
53
+ }
68
54
  };
69
55
  this.handleChange = this.handleChange.bind(this);
70
56
  this._debouncer = new Debouncer(this.handleChange);
@@ -74,18 +60,16 @@ export class SettingsFormEditor extends React.Component {
74
60
  this._setFilteredSchema();
75
61
  }
76
62
  componentDidUpdate(prevProps) {
77
- this._setUiSchema(prevProps.renderers);
63
+ this._setUiSchema(prevProps.renderers[prevProps.settings.id]);
78
64
  this._setFilteredSchema(prevProps.filteredValues);
79
- if (prevProps.translator !== this.props.translator) {
65
+ if (prevProps.settings !== this.props.settings) {
80
66
  this.setState({
81
- fieldTemplate: this._templateFactory.fieldTemplate,
82
- arrayFieldTemplate: this._templateFactory.arrayTemplate,
83
- objectFieldTemplate: this._templateFactory.objectTemplate
67
+ formContext: {
68
+ settings: this.props.settings,
69
+ defaultFormData: this.props.settings.default()
70
+ }
84
71
  });
85
72
  }
86
- if (prevProps.settings !== this.props.settings) {
87
- this.setState({ formContext: { settings: this.props.settings } });
88
- }
89
73
  }
90
74
  componentWillUnmount() {
91
75
  this._debouncer.dispose();
@@ -126,17 +110,17 @@ export class SettingsFormEditor extends React.Component {
126
110
  React.createElement("h2", null, this.props.settings.schema.title),
127
111
  React.createElement("div", { className: "jp-SettingsHeader-description" }, this.props.settings.schema.description)),
128
112
  this.state.isModified && (React.createElement("button", { className: "jp-RestoreButton", onClick: this.reset }, trans.__('Restore to Defaults')))),
129
- !this.props.isCollapsed && (React.createElement(Form, { schema: this.state.filteredSchema, formData: this._formData, FieldTemplate: this.state.fieldTemplate, ArrayFieldTemplate: this.state.arrayFieldTemplate, ObjectFieldTemplate: this.state.objectFieldTemplate, uiSchema: this.state.uiSchema, fields: this.props.renderers, formContext: this.state.formContext, liveValidate: true, idPrefix: `jp-SettingsEditor-${this.props.settings.id}`, onChange: this._onChange }))));
113
+ !this.props.isCollapsed && (React.createElement(FormComponent, { validator: validatorAjv8, schema: this.state.filteredSchema, formData: this._formData, uiSchema: this.state.uiSchema, fields: this.props.renderers[this.props.settings.id], formContext: this.state.formContext, liveValidate: true, idPrefix: `jp-SettingsEditor-${this.props.settings.id}`, onChange: this._onChange, translator: this.props.translator }))));
130
114
  }
131
115
  _setUiSchema(prevRenderers) {
132
116
  var _a;
133
- if (!prevRenderers ||
134
- !JSONExt.deepEqual(Object.keys(prevRenderers).sort(), Object.keys(this.props.renderers).sort())) {
117
+ const renderers = this.props.renderers[this.props.settings.id];
118
+ if (!JSONExt.deepEqual(Object.keys(prevRenderers !== null && prevRenderers !== void 0 ? prevRenderers : {}).sort(), Object.keys(renderers !== null && renderers !== void 0 ? renderers : {}).sort())) {
135
119
  /**
136
120
  * Construct uiSchema to pass any custom renderers to the form editor.
137
121
  */
138
122
  const uiSchema = {};
139
- for (const id in this.props.renderers) {
123
+ for (const id in this.props.renderers[this.props.settings.id]) {
140
124
  if (Object.keys((_a = this.props.settings.schema.properties) !== null && _a !== void 0 ? _a : {}).includes(id)) {
141
125
  uiSchema[id] = {
142
126
  'ui:field': id
@@ -1 +1 @@
1
- {"version":3,"file":"SettingsFormEditor.js","sourceRoot":"","sources":["../src/SettingsFormEditor.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SettingsFormEditor.js","sourceRoot":"","sources":["../src/SettingsFormEditor.tsx"],"names":[],"mappings":"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"}
package/lib/inspector.js CHANGED
@@ -87,7 +87,7 @@ class InspectorConnector extends DataConnector {
87
87
  return `**\`[${this._trans.__('syntax error')}]\`** *${error.message}*`;
88
88
  case 'type':
89
89
  return `**\`[${this._trans.__('type error')}]\`**
90
- \`${error.dataPath}\` ${error.message}`;
90
+ \`${error.instancePath}\` ${error.message}`;
91
91
  default:
92
92
  return `**\`[${this._trans.__('error')}]\`** *${error.message}*`;
93
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"inspector.js","sourceRoot":"","sources":["../src/inspector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inspector.js","sourceRoot":"","sources":["../src/inspector.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { ILabStatus } from '@jupyterlab/application';
2
2
  import { ISettingRegistry } from '@jupyterlab/settingregistry';
3
3
  import { IStateDB } from '@jupyterlab/statedb';
4
4
  import { ITranslator } from '@jupyterlab/translation';
5
- import { IFormComponentRegistry } from '@jupyterlab/ui-components';
5
+ import { IFormRendererRegistry } from '@jupyterlab/ui-components';
6
6
  import { CommandRegistry } from '@lumino/commands';
7
7
  import { Message } from '@lumino/messaging';
8
8
  import { ISignal } from '@lumino/signaling';
@@ -47,7 +47,7 @@ export declare namespace SettingsEditor {
47
47
  /**
48
48
  * Form component registry
49
49
  */
50
- editorRegistry: IFormComponentRegistry;
50
+ editorRegistry: IFormRendererRegistry;
51
51
  /**
52
52
  * The state database key for the editor's state management.
53
53
  */
@@ -1 +1 @@
1
- {"version":3,"file":"settingseditor.js","sourceRoot":"","sources":["../src/settingseditor.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAe,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAA0B,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIhF,OAAO,EAAW,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;GAEG;AACH,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC5C,YAAY,OAAgC;QAC1C,KAAK,CAAC;YACJ,WAAW,EAAE,YAAY;YACzB,QAAQ,EAAE,UAAU,CAAC,eAAe;YACpC,OAAO,EAAE,CAAC;SACX,CAAC,CAAC;QAyHG,gBAAW,GAAuB,IAAI,CAAC;QAEvC,WAAM,GAAY,KAAK,CAAC;QAExB,qBAAgB,GAAG,IAAI,MAAM,CAAiC,IAAI,CAAC,CAAC;QA5H1E,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAc,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9B,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC;YACxC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEnD;;WAEG;QACH,KAAK,OAAO,CAAC,GAAG,CACd,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;aACrC,MAAM,CAAC,MAAM,CAAC,EAAE;YACf,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAC1B,MAAM,UAAU,GAAG,MAAM,CAAC,gCAAgC,CAAC,KAAK,IAAI,CAAC;YACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACjE,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,KAAK,KAAK,CAAC;YAEzD,OAAO,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC;aACD,GAAG,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC/D;aACE,IAAI,CAAC,QAAQ,CAAC,EAAE;YACf,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CACtC,oBAAC,aAAa,IACZ,QAAQ,EACN,QAAQ,CAAC,MAAM,CACb,cAAc,CAAC,EAAE,WACf,OAAA,CAAC,CAAC,MAAA,OAAO,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA,EAAA,CACxC,EAEjB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,QAAQ,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,EACrD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAC7B,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,EACjD,gBAAgB,EAAE,IAAI,CAAC,aAAa,EACpC,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAChC,CACH,CAAC;YACF,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAChC,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sCAAsC,MAAM,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,KAAc;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACpC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC5C;aAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE;YAC3C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;SACzB;QACD,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAClD,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,eAAe,CAAC;aACzC;SACF;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;SACzE;QACD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED;;;;OAIG;IACO,cAAc,CAAC,GAAY;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;YACxB,KAAK,UAAU,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC;gBAC1B,IAAI,EAAE,KAAK,CAAC,EAAE,CACZ,mEAAmE,CACpE;aACF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACd,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACf,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;iBAC3B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YACtB,KAAK,UAAU,CAAC;gBACd,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC;gBAC1B,IAAI,EAAE,KAAK,CAAC,EAAE,CACZ,4DAA4D,CAC7D;aACF,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACd,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;oBACf,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;iBAC3B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SAC3B;IACH,CAAC;CAQF"}
1
+ {"version":3,"file":"settingseditor.js","sourceRoot":"","sources":["../src/settingseditor.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { ISettingRegistry, Settings } from '@jupyterlab/settingregistry';
2
2
  import { ITranslator } from '@jupyterlab/translation';
3
- import { IFormComponentRegistry } from '@jupyterlab/ui-components';
3
+ import { IFormRendererRegistry } from '@jupyterlab/ui-components';
4
4
  import { ISignal } from '@lumino/signaling';
5
5
  import React from 'react';
6
6
  import { PluginList } from './pluginlist';
@@ -14,7 +14,7 @@ export interface ISettingsPanelProps {
14
14
  * Form component registry that provides renderers
15
15
  * for the form editor.
16
16
  */
17
- editorRegistry: IFormComponentRegistry;
17
+ editorRegistry: IFormRendererRegistry;
18
18
  /**
19
19
  * Handler for when selection change is triggered by scrolling
20
20
  * in the SettingsPanel.
@@ -53,7 +53,7 @@ export const SettingsPanel = ({ settings, editorRegistry, onSelect, handleSelect
53
53
  (_a = handleSelectSignal === null || handleSelectSignal === void 0 ? void 0 : handleSelectSignal.disconnect) === null || _a === void 0 ? void 0 : _a.call(handleSelectSignal, onSelectChange);
54
54
  };
55
55
  }, []);
56
- const updateDirtyStates = (id, dirty) => {
56
+ const updateDirtyStates = React.useCallback((id, dirty) => {
57
57
  if (editorDirtyStates.current) {
58
58
  editorDirtyStates.current[id] = dirty;
59
59
  for (const editor in editorDirtyStates.current) {
@@ -64,7 +64,19 @@ export const SettingsPanel = ({ settings, editorRegistry, onSelect, handleSelect
64
64
  }
65
65
  }
66
66
  updateDirtyState(false);
67
- };
67
+ }, [editorDirtyStates, updateDirtyState]);
68
+ const renderers = React.useMemo(() => Object.entries(editorRegistry.renderers).reduce((agg, [id, renderer]) => {
69
+ const splitPosition = id.lastIndexOf('.');
70
+ const pluginId = id.substring(0, splitPosition);
71
+ const propertyName = id.substring(splitPosition + 1);
72
+ if (!agg[pluginId]) {
73
+ agg[pluginId] = {};
74
+ }
75
+ if (!agg[pluginId][propertyName] && renderer.fieldRenderer) {
76
+ agg[pluginId][propertyName] = renderer.fieldRenderer;
77
+ }
78
+ return agg;
79
+ }, {}), [editorRegistry]);
68
80
  return (React.createElement("div", { className: "jp-SettingsPanel", ref: wrapperRef }, settings.map(pluginSettings => {
69
81
  // Pass filtered results to SettingsFormEditor to only display filtered fields.
70
82
  const filtered = filterPlugin(pluginSettings.plugin);
@@ -80,7 +92,7 @@ export const SettingsPanel = ({ settings, editorRegistry, onSelect, handleSelect
80
92
  else if (pluginSettings.id === expandedPlugin) {
81
93
  setExpandedPlugin(null);
82
94
  }
83
- }, filteredValues: filtered, settings: pluginSettings, renderers: editorRegistry.renderers, hasError: (error) => {
95
+ }, filteredValues: filtered, settings: pluginSettings, renderers: renderers, hasError: (error) => {
84
96
  hasError(pluginSettings.id, error);
85
97
  }, updateDirtyState: (dirty) => {
86
98
  updateDirtyStates(pluginSettings.id, dirty);
@@ -1 +1 @@
1
- {"version":3,"file":"settingspanel.js","sourceRoot":"","sources":["../src/settingspanel.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"settingspanel.js","sourceRoot":"","sources":["../src/settingspanel.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/settingeditor",
3
- "version": "4.0.0-alpha.17",
3
+ "version": "4.0.0-alpha.19",
4
4
  "description": "The JupyterLab default setting editor interface",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -36,29 +36,31 @@
36
36
  "watch": "tsc -b --watch"
37
37
  },
38
38
  "dependencies": {
39
- "@jupyterlab/application": "^4.0.0-alpha.17",
40
- "@jupyterlab/apputils": "^4.0.0-alpha.17",
41
- "@jupyterlab/codeeditor": "^4.0.0-alpha.17",
42
- "@jupyterlab/inspector": "^4.0.0-alpha.17",
43
- "@jupyterlab/rendermime": "^4.0.0-alpha.17",
44
- "@jupyterlab/settingregistry": "^4.0.0-alpha.17",
45
- "@jupyterlab/statedb": "^4.0.0-alpha.17",
46
- "@jupyterlab/translation": "^4.0.0-alpha.17",
47
- "@jupyterlab/ui-components": "^4.0.0-alpha.32",
48
- "@lumino/algorithm": "^2.0.0-alpha.6",
49
- "@lumino/commands": "^2.0.0-alpha.6",
50
- "@lumino/coreutils": "^2.0.0-alpha.6",
51
- "@lumino/disposable": "^2.0.0-alpha.6",
52
- "@lumino/messaging": "^2.0.0-alpha.6",
53
- "@lumino/polling": "^2.0.0-alpha.6",
54
- "@lumino/signaling": "^2.0.0-alpha.6",
55
- "@lumino/widgets": "^2.0.0-alpha.6",
56
- "@rjsf/core": "^4.2.0",
39
+ "@jupyterlab/application": "^4.0.0-alpha.19",
40
+ "@jupyterlab/apputils": "^4.0.0-alpha.19",
41
+ "@jupyterlab/codeeditor": "^4.0.0-alpha.19",
42
+ "@jupyterlab/inspector": "^4.0.0-alpha.19",
43
+ "@jupyterlab/rendermime": "^4.0.0-alpha.19",
44
+ "@jupyterlab/settingregistry": "^4.0.0-alpha.19",
45
+ "@jupyterlab/statedb": "^4.0.0-alpha.19",
46
+ "@jupyterlab/translation": "^4.0.0-alpha.19",
47
+ "@jupyterlab/ui-components": "^4.0.0-alpha.34",
48
+ "@lumino/algorithm": "^2.0.0-beta.0",
49
+ "@lumino/commands": "^2.0.0-beta.1",
50
+ "@lumino/coreutils": "^2.0.0-beta.0",
51
+ "@lumino/disposable": "^2.0.0-beta.1",
52
+ "@lumino/messaging": "^2.0.0-beta.0",
53
+ "@lumino/polling": "^2.0.0-beta.0",
54
+ "@lumino/signaling": "^2.0.0-beta.1",
55
+ "@lumino/widgets": "^2.0.0-beta.1",
56
+ "@rjsf/core": "^5.1.0",
57
+ "@rjsf/utils": "^5.1.0",
58
+ "@rjsf/validator-ajv8": "^5.1.0",
57
59
  "json-schema": "^0.4.0",
58
- "react": "^17.0.1"
60
+ "react": "^18.2.0"
59
61
  },
60
62
  "devDependencies": {
61
- "@types/react": "^17.0.0",
63
+ "@types/react": "^18.0.26",
62
64
  "rimraf": "~3.0.0",
63
65
  "typedoc": "~0.22.10",
64
66
  "typescript": "~4.7.3"