Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to gridstack v6.0.1 #181

Merged
merged 2 commits into from
Sep 13, 2022
Merged

Updates to gridstack v6.0.1 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ebe08
Updates to gridstack v6.0.1 and fixes scrollbars in template
hbcarlos Sep 13, 2022
11698dd
pin nbconvert
hbcarlos Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/jupyterlab-gridstack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"gridstack": "^5.0.0",
"gridstack": "^6.0.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"yjs": "^13.5.6"
Expand Down
2 changes: 0 additions & 2 deletions packages/jupyterlab-gridstack/src/editor/gridstack/layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import { Message, MessageLoop } from '@lumino/messaging';

import { GridStack, GridStackNode, GridItemHTMLElement } from 'gridstack';

import 'gridstack/dist/h5/gridstack-dd-native';

import { GridStackItemWidget } from '../item';

import { DashboardView, DashboardCellView } from '../format';
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ install_requires =
[options.extras_require]
test =
ipykernel
nbconvert==6.5.0
pytest
pytest-tornasync
lxml
Expand Down
2 changes: 1 addition & 1 deletion share/jupyter/nbconvert/templates/gridstack/gridstack.js.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<script src="https://cdn.jsdelivr.net/npm/gridstack@5/dist/gridstack-h5.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@6.0.1/dist/gridstack-all.js"></script>
<script type="text/javascript">
const debounce = (callback, wait) => {
let timeoutId = null;
Expand Down
14 changes: 13 additions & 1 deletion share/jupyter/nbconvert/templates/gridstack/gridstack_base.html.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- extends 'lab/index.html.j2' -%}

{% block html_head_css %}
<link href="https://cdn.jsdelivr.net/npm/gridstack@5/dist/gridstack.min.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/gridstack@6.0.1/dist/gridstack.min.css" rel="stylesheet" />
{{ super() }}

<style>
Expand Down Expand Up @@ -41,6 +41,18 @@
color: var(--jp-ui-font-color0);
}

.jp-OutputArea {
overflow-y: unset !important;
}

.jp-OutputArea-output {
overflow: unset !important;
}

.jp-OutputArea pre {
overflow: unset !important;
}

.ui-resizable-se {
background-image: none !important;
transform: rotate(0deg) !important;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7022,10 +7022,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==

gridstack@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-5.0.0.tgz#b3b3f54f0bfda505d1e67c033d079b74622e00e3"
integrity sha512-FpXQ2gWUCcBW7QON7GEqP7NZFWZPpuGfze4dzRMQ1ikaRZ7Y2qfc9Gbc04Qukjst2AuPQcuW/mEJkh+2XnnCsA==
gridstack@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-6.0.1.tgz#05b1ae49913fe9a6b36f4fe4219340457299dbc0"
integrity sha512-j7FbRbkYjMr/pKPHRkAx9j9N4q+3+v6UfPnIf0zM3CJtA1HOFxpTLHjnKtqvCGm0hdH0jSPuC9NmxlA4x/oXKg==

growly@^1.3.0:
version "1.3.0"
Expand Down