Bump to drawio 15.8.7 (#75)

.github/environment-conda-build-win.yml

@@ -21,7 +21,7 @@ channels:
   - nodefaults
 
 dependencies:
-  - pywin32 !=302
+  - pywin32 !=302,!=301
   ### ipydrawio-conda-build-deps ###
 
   - boa

CHANGELOG.md

@@ -10,9 +10,9 @@
 
 #### @deathbeds/ipydrawio-notebook 1.1.2
 
-#### @deathbeds/ipydrawio-webpack 15.8.600
+#### @deathbeds/ipydrawio-webpack 15.8.700
 
-- upgrade to drawio v15.8.6 for enhancements and bug fixes
+- upgrade to drawio v15.8.7 for enhancements and bug fixes
 
 #### @deathbeds/ipydrawio-jupyter-templates 1.1.2
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "3.2.1",
+  "lerna": "4.0.0",
   "npmClient": "jlpm",
   "useWorkspaces": true,
   "version": "independent"

package.json

@@ -9,12 +9,16 @@
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.21.5",
-    "lerna": "^3.22.1",
+    "lerna": "^4.0.0",
     "prettier": "^2.1.1",
     "prettier-plugin-sort-json": "^0.0.2",
     "typedoc": "^0.20.36",
     "typedoc-plugin-markdown": "~3.9.0"
   },
+  "resolutions": {
+    "ansi-regex": ">=5.0.1",
+    "json-schema": ">=0.4.0"
+  },
   "prettier": {
     "singleQuote": true,
     "proseWrap": "always",

packages/ipydrawio-webpack/drawio

@@ -1 +1 @@
-Subproject commit 8bd26f358da648fd00b002815d39a37cbf160b57
+Subproject commit 0f4adefac54d1cb765d2688bdf0b4fe8a3061116

packages/ipydrawio-webpack/package.json

@@ -43,5 +43,5 @@
     "build:pre": "python scripts/patch.py && python scripts/static.py"
   },
   "types": "lib/index.d.ts",
-  "version": "15.8.600"
+  "version": "15.8.700"
 }

packages/ipydrawio/package.json

@@ -8,7 +8,7 @@
     "@jupyterlab/application": "^3.1.0",
     "@jupyterlab/launcher": "^3.1.0",
     "@jupyterlab/mainmenu": "^3.1.0",
-    "@deathbeds/ipydrawio-webpack": "^15.8.600"
+    "@deathbeds/ipydrawio-webpack": "^15.8.700"
   },
   "description": "A JupyterLab extension for embedding interactive drawio / mxgraph diagrams.",
   "devDependencies": {

packages/ipydrawio/src/createCustom.tsx

@@ -49,6 +49,7 @@ export class CreateCustom extends VDomRenderer<CreateCustom.Model> {
     return [
       <header key="header">
         <h1>New Diagram</h1>
+        <label>{this.model.cwd ? <pre>/{this.model.cwd}/</pre> : ''}</label>
         <input
           type="text"
           className="jp-mod-styled"
@@ -56,6 +57,7 @@ export class CreateCustom extends VDomRenderer<CreateCustom.Model> {
           placeholder="untitled"
           onChange={(evt) => (this.model.name = evt.currentTarget.value)}
         />
+        <label><pre>{this.model.format.ext}</pre></label>
         <button
           onClick={this.model.requestDocument}
           type="button"
@@ -167,7 +169,7 @@ export class CreateCustom extends VDomRenderer<CreateCustom.Model> {
           defaultChecked={index === -1}
         />
         <label htmlFor={id}>
-          {effectiveTheme}
+          {`${effectiveTheme} ${theme ? '' : '(default)'}`}
           <icon.react width={100} tag="span" />
           {this.renderTags(tags)}
         </label>
@@ -211,6 +213,7 @@ export class CreateCustom extends VDomRenderer<CreateCustom.Model> {
 export namespace CreateCustom {
   export interface IOptions {
     manager: IDiagramManager;
+    cwd?: string;
   }
 
   export class Model extends VDomModel {
@@ -222,10 +225,12 @@ export namespace CreateCustom {
     private _documentRequested = new Signal<Model, void>(this);
     private _format: IFormat = IO.XML_NATIVE;
     private _name: string = '';
+    private _cwd: string | null = null;
 
     constructor(options: IOptions) {
       super();
       this._manager = options.manager;
+      this._cwd = options.cwd || null;
       this._manager
         .templates()
         .then((templates) => {
@@ -252,6 +257,15 @@ export namespace CreateCustom {
       return this._manager;
     }
 
+    get cwd() {
+      return this._cwd;
+    }
+
+    set cwd(cwd: string | null) {
+      this._cwd = cwd;
+      this.stateChanged.emit(void 0);
+    }
+
     get name() {
       return this._name;
     }

packages/ipydrawio/src/manager.ts

@@ -107,8 +107,15 @@ export class DiagramManager implements IDiagramManager {
       execute: () => {
         const model = new CreateCustom.Model({ manager: this });
         const onChange = () => model.stateChanged.emit(void 0);
+        const onPath = () => (model.cwd = defaultBrowser.model.path);
+        const { defaultBrowser } = this._browserFactory || {};
+
         this._settings.changed.connect(onChange);
         this._templatesChanged.connect(onChange);
+        if (defaultBrowser) {
+          defaultBrowser.model.pathChanged.connect(onPath);
+          onPath();
+        }
         const content = new CreateCustom(model);
         const main = new MainAreaWidget({ content });
         const promiseDelegate = new PromiseDelegate<DiagramDocument>();
@@ -122,6 +129,10 @@ export class DiagramManager implements IDiagramManager {
           );
           this._settings.changed.disconnect(onChange);
           this._templatesChanged.disconnect(onChange);
+          if (defaultBrowser) {
+            defaultBrowser.model.pathChanged.disconnect(onPath);
+          }
+
           main.disposed.disconnect(onDisposed);
           promiseDelegate.resolve(diagramDocument);
           main.dispose();

packages/ipydrawio/style/index.css

@@ -52,7 +52,7 @@
 
 .jp-IPyDiagram-CreateCustom.jp-RenderedHTMLCommon ul {
   padding: 0;
-  margin: 0;
+  margin: 0 1em;
 }
 
 .jp-IPyDiagram-CreateCustom header {
@@ -62,6 +62,7 @@
   display: flex;
   border-bottom: solid 1px var(--jp-border-color0);
   align-items: center;
+  flex-wrap: wrap;
 }
 
 .jp-IPyDiagram-CreateCustom header h1 {
@@ -72,18 +73,22 @@
 
 .jp-RenderedHTMLCommon.jp-IPyDiagram-CreateCustom h1,
 .jp-RenderedHTMLCommon.jp-IPyDiagram-CreateCustom h2 {
-  min-width: 260px;
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+  padding: 0 0.5em;
 }
 
 .jp-IPyDiagram-CreateCustom header button {
   display: flex;
   align-items: center;
   padding: 1.5em;
+  margin-left: 1em;
 }
 
 .jp-IPyDiagram-CreateCustom input {
   flex: 1;
-  margin-right: 1em;
+  margin: 0 1em;
 }
 
 .jp-IPyDiagram-CreateCustom header button > * {
@@ -109,6 +114,7 @@
 
 .jp-IPyDiagram-CreateCustom section {
   display: flex;
+  flex-direction: column;
   margin-bottom: 1em;
 }