Modifications following review

Author: fcollonval

examples/introduction.ipynb

@@ -23,82 +23,18 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from bokeh.io import push_notebook, show, output_notebook\n",
-    "from bokeh.resources import INLINE\n",
-    "from bokeh.layouts import row\n",
-    "from bokeh.plotting import figure\n",
-    "output_notebook(resources=INLINE)\n",
-    "opts = dict(plot_width=250, plot_height=250, min_border=0)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "p1 = figure(**opts)\n",
-    "r1 = p1.circle([1,2,3], [4,5,6], size=20)\n",
-    "\n",
-    "p2 = figure(**opts)\n",
-    "r2 = p2.circle([1,2,3], [4,5,6], size=20)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sr = Sidecar(title='Main Sidecar')\n",
-    "with sr:\n",
-    "    # get a handle to update the shown cell with\n",
-    "    t = show(row(p1, p2), notebook_handle=True)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "r1.glyph.fill_color = \"white\"\n",
-    "push_notebook(handle=t)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sc = Sidecar(title='Right Sidecar', anchor='right')\n",
+    "sc = Sidecar(title='Sidecar Output')\n",
     "sl = IntSlider(description='Some slider')\n",
+    "\n",
     "with sc:\n",
     "    display(sl)"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "import plotly\n",
-    "import plotly.graph_objs as go\n",
-    "import plotly.tools as tls\n",
-    "from IPython.display import display\n",
-    "\n",
-    "import pandas as pd\n",
-    "# dataset = pd.read_csv('https://raw.githubusercontent.com/plotly/datasets/master/diabetes.csv')\n",
-    "dataset = pd.read_csv('diabetes.csv')\n",
-    "\n",
-    "subplot = tls.make_subplots(2, 2, print_grid=False)\n",
-    "f2 = go.FigureWidget(subplot)\n",
-    "\n",
-    "sl = Sidecar(title='Main Sidecar')\n",
-    "with sl:\n",
-    "    display(f2)"
+    "# Sidecar as main area panel"
    ]
   },
   {
@@ -107,56 +43,25 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Use add_trace method with optional row/col parameters\n",
-    "f2.add_trace(go.Scatter(x=dataset['Age'], y=dataset['Pregnancies'], mode='markers'), row=1, col=1)\n",
-    "\n",
-    "# Use add_traces with optional rows/cols parameters\n",
-    "f2.add_traces([\n",
-    "    go.Scatter(x=dataset['Age'], y=dataset['BMI'], mode='markers'),\n",
-    "    go.Scatter(x=dataset['Age'], y=dataset['SkinThickness'], mode='markers')],\n",
-    "    rows=[1, 2], cols=[2, 1]\n",
-    ")\n",
-    "\n",
-    "# Use add_scatter with optional row/col parameters\n",
-    "f2.add_scatter(x=dataset['Age'], y=dataset['BloodPressure'], mode='markers', row=2, col=2)\n",
+    "sl = IntSlider(description='Some slider')\n",
     "\n",
-    "f2.layout.title = 'Age and Diabetes Factors'"
+    "with Sidecar(title='Sidecar Output Main', anchor='split-right'):\n",
+    "    display(sl)"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "import numpy as np\n",
-    "data = [dict(\n",
-    "        visible = False,\n",
-    "        line=dict(color='#00CED1', width=6),\n",
-    "        name = '𝜈 = '+str(step),\n",
-    "        x = np.arange(0,10,0.01),\n",
-    "        y = np.sin(step*np.arange(0,10,0.01))) for step in np.arange(0,5,0.1)]\n",
-    "data[10]['visible'] = True\n",
-    "\n",
-    "steps = []\n",
-    "for i in range(len(data)):\n",
-    "    step = dict(\n",
-    "        method = 'restyle',  \n",
-    "        args = ['visible', [False] * len(data)],\n",
-    "    )\n",
-    "    step['args'][1][i] = True # Toggle i'th trace to \"visible\"\n",
-    "    steps.append(step)\n",
-    "\n",
-    "sliders = [dict(\n",
-    "    active = 10,\n",
-    "    currentvalue = {\"prefix\": \"Frequency: \"},\n",
-    "    pad = {\"t\": 50},\n",
-    "    steps = steps\n",
-    ")]\n",
-    "\n",
-    "layout = dict(sliders=sliders)\n",
+    "`anchor` can take one of the following value: \n",
     "\n",
-    "go.FigureWidget(data, layout)"
+    "- 'split-right': main panel right of the notebook,\n",
+    "- 'split-left': main panel left of the notebook,\n",
+    "- 'split-top': main panel above the notebook,\n",
+    "- 'split-bottom': main panel below the notebook, \n",
+    "- 'tab-before': main panel stacked before the tab notebook,\n",
+    "- 'tab-after': main panel stacked after the tab notebook,\n",
+    "- 'right': [default] right sidebar panel."
    ]
   }
  ],
@@ -181,4 +86,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

sidecar/sidecar.py

@@ -23,4 +23,8 @@ class Sidecar(Output):
     _view_module = Unicode(module_name).tag(sync=True)
     _view_module_version = Unicode(EXTENSION_SPEC_VERSION).tag(sync=True)
     title = Unicode('Sidecar').tag(sync=True)
-    anchor = CaselessStrEnum(['split-right', 'split-left', 'split-top', 'split-bottom', 'tab-before', 'tab-after', 'right'], default_value='split-right', allow_none=False).tag(sync=True)
+    anchor = CaselessStrEnum(
+        ['split-right', 'split-left', 'split-top', 'split-bottom', 'tab-before', 'tab-after', 'right'],
+        default_value='right', 
+        allow_none=False
+    ).tag(sync=True)

src/plugin.ts

@@ -54,10 +54,6 @@ function activateWidgetExtension(app: JupyterLab, registry: IJupyterWidgetRegist
           w.addClass('jp-LinkedOutputView');
           w.title.label = this.model.get('title');
           w.title.closable = true;
-          // TODO how to make a left tab closable
-          // app.shell['_leftHandler'].sideBar.tabCloseRequested.connect((sender : any, tab : any) => {
-          //     tab.title.owner.dispose();
-          // });
           app.shell['_rightHandler'].sideBar.tabCloseRequested.connect((sender : any, tab : any) => {
               tab.title.owner.dispose();
           });
@@ -73,11 +69,8 @@ function activateWidgetExtension(app: JupyterLab, registry: IJupyterWidgetRegist
             if(anchor === 'right'){
               app.shell.add(w, 'right');
               app.shell.expandRight();
-            // } else if(anchor === 'left') {
-            //   app.shell.add(w, 'left');
-            //   app.shell.expandLeft();
             } else {
-              app.shell.addToMainArea(w, {mode: anchor});
+              app.shell.add(w, 'main', {mode: anchor});
             }
           }
         }