Merge pull request #80 from hbcarlos/rtc

Refactor and improvements

Author: jtpio

binder/environment.yml

@@ -17,5 +17,6 @@ dependencies:
   - nodejs >=14,<15
   - pip
   - wheel
+  - jupyterlab-link-share=0.2
   # additional packages for demos
   # - ipywidgets

package.json

@@ -21,6 +21,7 @@
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "style": "style/index.css",
   "repository": {
     "type": "git",
     "url": "https://github.com/wolfv/jupyterlab-drawio.git"
@@ -29,7 +30,7 @@
     "build": "jlpm run build:lib && jlpm run build:labextension:dev",
     "build:labextension": "jupyter labextension build .",
     "build:labextension:dev": "jupyter labextension build --development True .",
-    "build:lib": "rimraf lib/mxgraph && mkdir -p lib/mxgraph && cp -R src/mxgraph lib && tsc",
+    "build:lib": "rimraf lib/drawio && mkdir -p lib/drawio && cp -R src/drawio lib && tsc",
     "build:prod": "jlpm run build:lib && jlpm run build:labextension",
     "clean": "jlpm run clean:lib",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
@@ -44,18 +45,18 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.2",
-    "@jupyterlab/apputils": "^3.0.2",
-    "@jupyterlab/coreutils": "^5.0.1",
-    "@jupyterlab/docregistry": "^3.0.2",
-    "@jupyterlab/filebrowser": "^3.0.2",
-    "@jupyterlab/launcher": "^3.0.2",
-    "@jupyterlab/mainmenu": "^3.0.2",
+    "@jupyterlab/application": "^3.0.6",
+    "@jupyterlab/apputils": "^3.0.5",
+    "@jupyterlab/coreutils": "^5.0.3",
+    "@jupyterlab/docregistry": "^3.0.6",
+    "@jupyterlab/filebrowser": "^3.0.6",
+    "@jupyterlab/launcher": "^3.0.5",
+    "@jupyterlab/mainmenu": "^3.0.5",
     "@lumino/coreutils": "^1.5.3",
     "@lumino/widgets": "^1.18.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0",
+    "@jupyterlab/builder": "^3.0.5",
     "@lumino/messaging": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^2.27.0",
     "@typescript-eslint/parser": "^2.27.0",
@@ -70,6 +71,7 @@
   },
   "jupyterlab": {
     "extension": true,
+    "schemaDir": "schema",
     "outputDir": "jupyterlab-drawio/labextension"
   },
   "styleModule": "style/index.js"

schema/settings.json

@@ -0,0 +1,203 @@
+{
+  "title": "DrawIO",
+  "description": "DrawIO settings.",
+  "jupyter.lab.shortcuts": [
+    {
+      "command": "drawio:command/print",
+      "keys": ["Ctrl+P"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/undo",
+      "keys": ["Ctrl+Z"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/redo",
+      "keys": ["Ctrl+Shift+Z"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/cut",
+      "keys": ["Ctrl+X"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/copy",
+      "keys": ["Ctrl+C"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/paste",
+      "keys": ["Ctrl+V"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/duplicate",
+      "keys": ["Ctrl+D"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/editData",
+      "keys": ["Ctrl+M"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/editStyle",
+      "keys": ["Ctrl+E"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/edit",
+      "keys": ["F2/Enter"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/selectVertices",
+      "keys": ["Ctrl+Shift+I"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/selectEdges",
+      "keys": ["Ctrl+Shift+E"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/selectAll",
+      "keys": ["Ctrl+A"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/selectNone",
+      "keys": ["Ctrl+Shift+A"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/lockUnlock",
+      "keys": ["Ctrl+L"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/formatPanel",
+      "keys": ["Ctrl+Shift+P"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/outline",
+      "keys": ["Ctrl+Shift+O"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/layers",
+      "keys": ["Ctrl+Shift+L"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/grid",
+      "keys": ["Ctrl+Shift+G"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/connectionArrows",
+      "keys": ["Alt+Shift+A"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/connectionPoints",
+      "keys": ["Alt+Shift+P"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/resetView",
+      "keys": ["Ctrl+H"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/zoomIn",
+      "keys": ["Ctrl+(Numpad)/Alt+Mousewheel"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/zoomOut",
+      "keys": ["Ctrl-(Numpad)/Alt+Mousewheel"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/toFront",
+      "keys": ["Ctrl+Shift+F"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/toBack",
+      "keys": ["Ctrl+Shift+B"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/turn",
+      "keys": ["Ctrl+R"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/exitGroup",
+      "keys": ["Ctrl+Shift+Home"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/enterGroup",
+      "keys": ["Ctrl+Shift+End"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/expand",
+      "keys": ["Ctrl+End"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/collapse",
+      "keys": ["Ctrl+Home"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/group",
+      "keys": ["Ctrl+G"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/ungroup",
+      "keys": ["Ctrl+Shift+U"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/clearWaypoints",
+      "keys": ["Alt+Shift+C"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/autosize",
+      "keys": ["Ctrl+Shift+Y"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/fitWindow",
+      "keys": ["Ctrl+Shift+H"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/fitPage",
+      "keys": ["Ctrl+J"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/fitTwoPages",
+      "keys": ["Ctrl+Shift+J"],
+      "selector": "body"
+    },
+		{
+      "command": "drawio:command/customZoom",
+      "keys": ["Ctrl+O"],
+      "selector": "body"
+    }
+  ],
+  "type": "object",
+  "additionalProperties": false
+}

scripts/copyfiles.js

@@ -1,8 +1,11 @@
 var fs = require('fs-extra');
 
-fs.copySync('src/mxgraph/javascript/src/', 'lib/mxgraph/javascript/src/');
-fs.copySync('src/mxgraph/javascript/examples/grapheditor/www/', 'lib/mxgraph/javascript/examples/grapheditor/www/');
+//fs.copySync('src/mxgraph/javascript/src/', 'lib/mxgraph/javascript/src/');
+//fs.copySync('src/mxgraph/javascript/examples/grapheditor/www/', 'lib/mxgraph/javascript/examples/grapheditor/www/');
 // fs.copySync('src/mxgraph/javascript/examples/grapheditor/www/resources/grapheditor.txt',
 // 			'lib/mxgraph/javascript/examples/grapheditor/www/resources/grapheditor.md');
 // fs.copySync('src/mxgraph/javascript/examples/grapheditor/www/resources/grapheditor.txt',
 // 			'src/mxgraph/javascript/examples/grapheditor/www/resources/grapheditor.md');
+
+fs.copySync('src/drawio/', 'lib/drawio/');
+//fs.copySync('src/drawio/', 'lib/drawio/');

src/mxgraph/javascript/examples/grapheditor/www/combination.js renamed to src/drawio/combination.js

@@ -7,7 +7,7 @@ div.mxRubberband {
 	background: #0077FF;
 }
 .mxCellEditor {
-	background: url('../images/transparent.gif');
+	background: url('../img/transparent.gif');
 	border-color: transparent;
 	border-style: solid;
 	position: absolute;
@@ -27,7 +27,7 @@ div.mxWindow {
 	-webkit-box-shadow: 3px 3px 12px #C0C0C0;
 	-moz-box-shadow: 3px 3px 12px #C0C0C0;
 	box-shadow: 3px 3px 12px #C0C0C0;
-	background: url('../images/window.gif');
+	background: url('../img/window.gif');
 	border:1px solid #c3c3c3;
 	position: absolute;
 	overflow: hidden;
@@ -40,7 +40,7 @@ table.mxWindow {
 	font-size: 8pt;
 }
 td.mxWindowTitle {
-	background: url('../images/window-title.gif') repeat-x;
+	background: url('../img/window-title.gif') repeat-x;
 	text-overflow: ellipsis;
 	white-space: nowrap;
  	text-align: center;
@@ -73,7 +73,7 @@ td.mxWindowPane input, td.mxWindowPane select, td.mxWindowPane textarea, td.mxWi
  	padding: 1px;
 }
 td.mxWindowPane button {
-	background: url('../images/button.gif') repeat-x;
+	background: url('../img/button.gif') repeat-x;
   	font-family: Arial;
   	font-size: 8pt;
   	padding: 2px;
@@ -124,7 +124,7 @@ div.mxPopupMenu {
 	-webkit-box-shadow: 3px 3px 12px #C0C0C0;
 	-moz-box-shadow: 3px 3px 12px #C0C0C0;
 	box-shadow: 3px 3px 12px #C0C0C0;
-	background: url('../images/window.gif');
+	background: url('../img/window.gif');
 	position: absolute;
 	border-style: solid;
 	border-width: 1px;