Skip to content

Commit

Permalink
Merge pull request #288 from widgetti/fix_altair_in_jupyter
Browse files Browse the repository at this point in the history
fix: make altair work in Jupyter notebook and Jupyter Lab
  • Loading branch information
maartenbreddels committed Sep 15, 2023
2 parents 1235904 + 1ba4301 commit a3f9051
Showing 1 changed file with 40 additions and 16 deletions.
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

0 comments on commit a3f9051

Please sign in to comment.