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.

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

fix: make altair work in Jupyter notebook and Jupyter Lab #288

Merged
merged 2 commits into from
Sep 15, 2023
Merged
Changes from all commits
Commits
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
56 changes: 40 additions & 16 deletions solara/widgets/vue/vegalite.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,11 @@
<script>
module.exports = {
created() {
requirejs.undef("vega")
requirejs.undef("vega-lite")
requirejs.undef("vega-embed")
require.config({
map: {
'*': {
'vega': `${this.getCdn()}/vega@5`,
'vega-lite': `${this.getCdn()}/[email protected]`,
'vega-embed': `${this.getCdn()}/vega-embed@6`,
}
}
})
// pre load
require(['vega', 'vega-lite', 'vega-embed'], () => {
})
this.do_plot_debounced = _.debounce(() => this.do_plot(), 100)
this.vegaLoaded = this.loadVega();
this.do_plot_debounced = _.debounce(async () => {
await this.vegaLoaded;
this.do_plot()
}, 100)
},
mounted() {
this.do_plot_debounced();
Expand Down Expand Up @@ -64,6 +53,41 @@ module.exports = {
})();
});
},
async loadVega() {
await this.loadRequire();
requirejs.undef("vega")
requirejs.undef("vega-lite")
requirejs.undef("vega-embed")
require.config({
map: {
'*': {
'vega': `${this.getCdn()}/vega@5/build/vega.min.js`,
'vega-lite': `${this.getCdn()}/vega-lite@5/build/vega-lite.min.js`,
'vega-embed': `${this.getCdn()}/vega-embed@6/build/vega-embed.min.js`,
}
}
})
// pre load
await new Promise((resolve, reject) => {
require(['vega', 'vega-lite', 'vega-embed'], () => {
resolve()
}, reject)
});
},
loadRequire() {
/* Needed in lab */
if (window.requirejs) {
console.log('require found');
return Promise.resolve()
}
return new Promise((resolve, reject) => {
const script = document.createElement('script');
script.src = `${this.getCdn()}/[email protected]/require.js`;
script.onload = resolve;
script.onerror = reject;
document.head.appendChild(script);
});
},
getBaseUrl() {
if (window.solara && window.solara.rootPath !== undefined) {
return solara.rootPath + "/";
Expand Down
Loading