@marimo-team/frontend 0.23.9-dev45 → 0.23.9-dev47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{CellStatus-B0Fz0F4Y.js → CellStatus-BLWR83i_.js} +1 -1
- package/dist/assets/{JsonOutput-B2v_Stn9.js → JsonOutput-BJaeXQim.js} +1 -1
- package/dist/assets/{MarimoErrorOutput-DWt3lI06.js → MarimoErrorOutput-B0h5OVW9.js} +1 -1
- package/dist/assets/{RenderHTML-CP7UDK5X.js → RenderHTML-ChwPJgPd.js} +1 -1
- package/dist/assets/{RunButton-BIFIZ7Iv.js → RunButton-NDsrcmxR.js} +1 -1
- package/dist/assets/{add-cell-with-ai-CAC7vFzu.js → add-cell-with-ai-FxJitVGs.js} +1 -1
- package/dist/assets/{add-connection-dialog-C6y-WHQz.js → add-connection-dialog-EgkKupsZ.js} +1 -1
- package/dist/assets/{agent-panel-CztVh0_v.js → agent-panel-BSt1fSQZ.js} +1 -1
- package/dist/assets/{ai-model-dropdown-BToySVta.js → ai-model-dropdown-DxAk02Lc.js} +1 -1
- package/dist/assets/{app-config-button-BjRm2yh5.js → app-config-button-BcOcIm9W.js} +1 -1
- package/dist/assets/{cell-editor-nGYckExu.js → cell-editor-C5CDtKML.js} +1 -1
- package/dist/assets/{cell-link-CW22jH60.js → cell-link-B1pHtGWp.js} +1 -1
- package/dist/assets/{cells-CFd8A4_A.js → cells-BsaJrRWi.js} +1 -1
- package/dist/assets/{chat-display-BnWhAO8B.js → chat-display-ccjE30z9.js} +1 -1
- package/dist/assets/{chat-panel-DXiPy2pt.js → chat-panel-CtvtP3kb.js} +1 -1
- package/dist/assets/{chat-ui-CHaOV403.js → chat-ui-DV8CD_s1.js} +1 -1
- package/dist/assets/{column-preview-CCTTw4tm.js → column-preview-BPismotx.js} +1 -1
- package/dist/assets/{command-palette-DMoSE_z1.js → command-palette-Cdy8eCpi.js} +1 -1
- package/dist/assets/{common-C1B2sLXd.js → common-6n8M1qiK.js} +1 -1
- package/dist/assets/{components-BYC1jwIq.js → components-BzBUxUz0.js} +1 -1
- package/dist/assets/{components-D_5hgeFU.js → components-CK-WtvAJ.js} +1 -1
- package/dist/assets/config-ClMcu_sV.js +1 -0
- package/dist/assets/{datasource-DiYrzHFG.js → datasource-DjDpJnbt.js} +1 -1
- package/dist/assets/{dependency-graph-panel-BIsy_CIT.js → dependency-graph-panel-BNaXAcZr.js} +1 -1
- package/dist/assets/{documentation-panel-B2yxm9NW.js → documentation-panel-5jUKZR-l.js} +1 -1
- package/dist/assets/{download-BaGnGHOq.js → download-DT8gf0PL.js} +1 -1
- package/dist/assets/edit-page-B7KTvcRN.js +9 -0
- package/dist/assets/{error-panel-Btthwogx.js → error-panel-DHcg_ER5.js} +1 -1
- package/dist/assets/{file-explorer-panel-BwlHcepA.js → file-explorer-panel-CbOdvGyZ.js} +1 -1
- package/dist/assets/{file-icons-CIKQdTpO.js → file-icons-BiMOJy0r.js} +1 -1
- package/dist/assets/{floating-outline-CEy7C9R6.js → floating-outline-BN9sAcQ0.js} +1 -1
- package/dist/assets/{focus-DjmSWsDI.js → focus-q38vUCl-.js} +1 -1
- package/dist/assets/{form-PMq9H-I_.js → form-BtBTvVVd.js} +1 -1
- package/dist/assets/{globals-FM_XB1In.js → globals-7JnRMGd4.js} +1 -1
- package/dist/assets/{home-page-CNWhDe7y.js → home-page-lXjPDNM0.js} +1 -1
- package/dist/assets/{hooks-BfsdgkfD.js → hooks-DP41kAWj.js} +1 -1
- package/dist/assets/{html-to-image-CJxTFjQz.js → html-to-image-BWL3Ct4n.js} +1 -1
- package/dist/assets/index-BIw7BKLH.css +2 -0
- package/dist/assets/{index-BT6rKXr9.js → index-awsLWRjZ.js} +4 -4
- package/dist/assets/{kiosk-mode-CtlXE_Xv.js → kiosk-mode-BqvqWsFx.js} +1 -1
- package/dist/assets/layout-DXDnDtNw.js +9 -0
- package/dist/assets/{logs-panel-DFXVtdbp.js → logs-panel-BNoBKY1q.js} +1 -1
- package/dist/assets/{markdown-renderer-B1eFOa7V.js → markdown-renderer-CU5Lbyax.js} +1 -1
- package/dist/assets/{name-cell-input-DdwASAQy.js → name-cell-input-BNc3X9qF.js} +1 -1
- package/dist/assets/{outline-panel-CCgZPS64.js → outline-panel-De2gw3Ro.js} +1 -1
- package/dist/assets/{packages-panel-j1RhwwPL.js → packages-panel-C8maQt0Q.js} +1 -1
- package/dist/assets/{pair-with-agent-modal-D8eOWIWE.js → pair-with-agent-modal-1tufe5MP.js} +1 -1
- package/dist/assets/panels-BKv_j2lC.js +1 -0
- package/dist/assets/{process-output-DaNYZ78d.js → process-output-B2oklQi4.js} +1 -1
- package/dist/assets/{radio-group-PmOgsvro.js → radio-group-DlVSuZ_1.js} +1 -1
- package/dist/assets/{readonly-python-code-A3C9oCts.js → readonly-python-code-D3_kHsDx.js} +1 -1
- package/dist/assets/reveal-component-C50CTy8h.js +1069 -0
- package/dist/assets/{run-page-BtP-TTb3.js → run-page-DeOIw0On.js} +1 -1
- package/dist/assets/{scratchpad-panel-shvLtU2N.js → scratchpad-panel-DWbD_QB3.js} +1 -1
- package/dist/assets/{session-panel-D8BxQC75.js → session-panel-BHgL-7KC.js} +1 -1
- package/dist/assets/{snippets-panel-DlmVBDpu.js → snippets-panel-FY_Ezibl.js} +1 -1
- package/dist/assets/{state-CAn3OpIa.js → state-BTTshiKq.js} +1 -1
- package/dist/assets/{state-CEiXUajw.js → state-D-2KaAHK.js} +1 -1
- package/dist/assets/{switch-35WUzMpb.js → switch-BiU_sAcn.js} +1 -1
- package/dist/assets/{terminal-CSFhp6UG.js → terminal-BYGihNNp.js} +1 -1
- package/dist/assets/{textarea-DQ0XiNGe.js → textarea-DwltG8V6.js} +1 -1
- package/dist/assets/{tracing-panel-DhP3ygQA.js → tracing-panel-bN0O3PuU.js} +2 -2
- package/dist/assets/{tracing-BV9mu9dM.js → tracing-zLH-qWb2.js} +1 -1
- package/dist/assets/{useBoolean-_e4hdH_M.js → useBoolean-Bp18o6XG.js} +1 -1
- package/dist/assets/{useCellActionButton-CXkISThQ.js → useCellActionButton-h5LjhtEx.js} +1 -1
- package/dist/assets/{useDeleteCell-CH_1gU2V.js → useDeleteCell-BBPIhnQj.js} +1 -1
- package/dist/assets/{useDependencyPanelTab-CLNYiwom.js → useDependencyPanelTab-BSkmlMqr.js} +1 -1
- package/dist/assets/{useNotebookActions-1Xqto4ts.js → useNotebookActions-B32eCmtG.js} +1 -1
- package/dist/assets/{useRunCells-DQDFDt2R.js → useRunCells-BiCBGyeW.js} +1 -1
- package/dist/assets/{useSplitCell-Cle-KXDv.js → useSplitCell-uogO-7ac.js} +1 -1
- package/dist/assets/{vega-component-BTe5wXGH.js → vega-component-COOhhZ3h.js} +1 -1
- package/dist/index.html +27 -27
- package/package.json +1 -1
- package/src/components/editor/Disconnected.tsx +1 -60
- package/src/components/editor/__tests__/viewer-banner.test.tsx +89 -0
- package/src/components/editor/header/__tests__/status.test.tsx +0 -15
- package/src/components/editor/header/app-header.tsx +1 -4
- package/src/components/editor/header/status.tsx +4 -13
- package/src/components/editor/renderers/slides-layout/__tests__/compute-slide-cells.test.ts +30 -17
- package/src/components/editor/renderers/slides-layout/compute-slide-cells.ts +17 -8
- package/src/components/editor/renderers/slides-layout/slides-layout.tsx +9 -11
- package/src/components/editor/viewer-banner.tsx +82 -0
- package/src/components/slides/minimap.tsx +45 -9
- package/src/components/slides/reveal-component.tsx +79 -34
- package/src/core/edit-app.tsx +3 -0
- package/src/core/islands/bootstrap.ts +2 -0
- package/src/core/kernel/__tests__/handlers.test.ts +5 -0
- package/src/core/websocket/__tests__/useMarimoKernelConnection.test.ts +0 -13
- package/src/core/websocket/types.ts +0 -6
- package/src/core/websocket/useMarimoKernelConnection.tsx +3 -12
- package/dist/assets/config-DdDKNgb1.js +0 -1
- package/dist/assets/edit-page-ByHt9KCi.js +0 -9
- package/dist/assets/index-DAfPvCnw.css +0 -2
- package/dist/assets/layout-KNg4OZ4V.js +0 -9
- package/dist/assets/panels-ZYkk-m0X.js +0 -1
- package/dist/assets/reveal-component-yjuk64m1.js +0 -1069
|
@@ -1 +1 @@
|
|
|
1
|
-
import{s as Z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-DhnxH9Rh.js";import{_,d as V}from"./useEventListener-DvoEXWke.js";import{n as H}from"./config-DdDKNgb1.js";import{t as nt}from"./cn-DCUzRj2J.js";import{t as rt}from"./jsx-runtime-BqBOg78p.js";import"./fullscreen-eipL3i3Y.js";import{t as at}from"./tooltip-DTV9tlSr.js";import{r as it}from"./button-BbCh-29a.js";import{d as N}from"./arrays-DYDL-3-i.js";import{u as ot}from"./toDate-B5A0DFEz.js";import"./session-0B5NBztP.js";import{r as lt}from"./useTheme-CI2eq4XN.js";import{t as ct}from"./isValid-CklTTytn.js";import{a as st,r as mt,t as pt}from"./utils-DCL4n9wx.js";import{n as ut}from"./vega-loader.browser-C8wT63Va.js";import{t as ft}from"./react-vega-CXIQBUis.js";import"./defaultLocale-BLUna9fQ.js";import"./defaultLocale-DzliDDTm.js";import{r as dt,t as ht}from"./alert-yTS3WpF4.js";import{n as gt}from"./error-banner-LdWZDbqd.js";import{t as yt}from"./formats-b7Sf6DAK.js";import{n as vt}from"./useAsyncData-bgszE9F0.js";import{t as F}from"./useDeepCompareMemoize-zUHU--0D.js";import{t as kt}from"./semaphore-FlZezxaf.js";var bt=tt(),S=Z(Y(),1);function wt(t){return t.data&&"url"in t.data&&(t.data.url=H(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var W=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(W.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!W.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},v={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:v.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:v.interval(e),select:{type:"interval",encodings:D(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:v.point(e),select:{type:"point",encodings:D(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:v.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:v.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:v.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function D(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=St(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function St(t){var a,i;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(i=t.encoding)==null?void 0:i.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function xt(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function G(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,i]=n;return!i||!At.has(a)?[]:"field"in i&&typeof i.field=="string"?[i.field]:"condition"in i&&i.condition&&typeof i.condition=="object"&&"field"in i.condition&&i.condition.field&&typeof i.condition.field=="string"?[i.condition.field]:[]}):[]}var At=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function $(t,e,n,a){let i=n.filter(o=>v.isBinColoring(o)),r={and:(i.length>0?i:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:r,value:o},value:o/5}}}else return e}function _t(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function q(t){let e=E(t);if(e.length===0)return t;let n=jt(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function jt(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:i}of t){let r=new Set;for(let o of i){let s=_t(o);r.has(s)||(r.add(s),e.has(s)||e.set(s,{count:0,param:o}),e.get(s).count++)}}let a=[];for(let[,{count:i,param:r}]of e)i===n&&a.push(r);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let i of n){if(!i||typeof i!="object"||!("name"in i)){a.push(i);continue}e.has(i.name)||a.push(i)}if(a.length===0){let{params:i,...r}=t;return r}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",t.encoding||{},e,t.mark)}:t}function T(t,e){var s,h;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(s=t.params)!=null&&s.some(l=>l.bind==="legend")&&(a=!1);let i=(h=t.params)==null?void 0:h.some(l=>!l.bind);i&&(n=!1);let r="vconcat"in t||"hconcat"in t;if(i&&r)return t;if("vconcat"in t){let l=t.vconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,vconcat:l})}if("hconcat"in t){let l=t.hconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,hconcat:l})}if("layer"in t){let l=t.params&&t.params.length>0,m=a!==!1&&!l,k=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?G(f):[]);k=[...new Set(p)],Array.isArray(a)&&(k=k.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let g=p;if(f===0&&k.length>0){let O=k.map(M=>j.legend(M));g={...g,params:[...g.params||[],...O]}}return g=z(g,n,f),g=J(g),f===0&&(g=B(g)),g});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=Ot(o,a),o=z(o,n,void 0),o=J(o),o=B(o),o}function Ot(t,e){if(e===!1)return t;let n=G(t);Array.isArray(e)&&(n=n.filter(r=>e.includes(r)));let a=n.map(r=>j.legend(r)),i=[...t.params||[],...a];return{...t,params:i}}function z(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let i=xt(t),r=e===!0?i.length>0?["point"]:Mt(a):[e];if(!r||r.length===0)return t;let o=r.map(h=>h==="interval"?j.interval(t,n):j.point(t,n)),s=[...t.params||[],...o];return i.length>0&&r.includes("point")&&s.push(j.binColoring(n)),{...t,params:s}}function B(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function J(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(i=>i.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",e||{},a,t.mark)}}function Mt(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}var Nt=5;async function Pt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=new kt(Nt),a=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(a));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(a));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(a));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await a(r.spec)}),!r.data||!("url"in r.data))return r;let o;try{o=H(r.data.url)}catch{return r}let s=r.data.format,h=await n.run(()=>st(o.href,s));return e[o.pathname]=h,{...r,data:{name:o.pathname}}},i=await a(t);return Object.keys(e).length===0?i:{...i,datasets:e}}var d=Z(rt(),1);ut("arrow",yt);var It=t=>{let e=(0,bt.c)(12),{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:o,embedOptions:s}=t,h,l;e[0]===o?(h=e[1],l=e[2]):(h=async()=>Pt(o),l=[o],e[0]=o,e[1]=h,e[2]=l);let{data:m,error:k}=vt(h,l);if(k){let p;return e[3]===k?p=e[4]:(p=(0,d.jsx)(gt,{error:k}),e[3]=k,e[4]=p),p}if(!m)return null;let w;return e[5]!==i||e[6]!==s||e[7]!==r||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Ct,{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:m,embedOptions:s}),e[5]=i,e[6]=s,e[7]=r,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Ct=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:i,embedOptions:r})=>{let{theme:o}=lt(),s=(0,S.useRef)(null),h=(0,S.useRef)(void 0),[l,m]=(0,S.useState)(),k=(0,S.useMemo)(()=>r&&"actions"in r?r.actions:{source:!1,compiled:!1},[r]),w=F(i),p=(0,S.useMemo)(()=>T(wt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),g=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,y)=>{_.debug("[Vega signal]",c,y);let b=V.mapValues(y,Kt);b=V.mapValues(b,Et),g({[c]:b})},100),[g]),M=F(f),I=(0,S.useMemo)(()=>M.reduce((c,y)=>(v.PAN_ZOOM===y||v.isBinColoring(y)||c.push({signalName:y,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),R=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),h.current=c,m(void 0)}),U=()=>{let c=[];return v.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),v.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),v.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),v.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((y,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[y[0],":"]})," ",y[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:s,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:k,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:R,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.addSignalListener(c,y)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.removeSignalListener(c,y)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[l&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:l.message}),(0,d.jsx)("div",{className:"text-md",children:l.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:s,"data-container-width":pt(p)}),U()]})]})};function Et(t){return t instanceof Set?[...t]:t}function Kt(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Lt=It;export{Lt as default};
|
|
1
|
+
import{s as Z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-DhnxH9Rh.js";import{_,d as V}from"./useEventListener-DvoEXWke.js";import{n as H}from"./config-ClMcu_sV.js";import{t as nt}from"./cn-DCUzRj2J.js";import{t as rt}from"./jsx-runtime-BqBOg78p.js";import"./fullscreen-eipL3i3Y.js";import{t as at}from"./tooltip-DTV9tlSr.js";import{r as it}from"./button-BbCh-29a.js";import{d as N}from"./arrays-DYDL-3-i.js";import{u as ot}from"./toDate-B5A0DFEz.js";import"./session-0B5NBztP.js";import{r as lt}from"./useTheme-CI2eq4XN.js";import{t as ct}from"./isValid-CklTTytn.js";import{a as st,r as mt,t as pt}from"./utils-DCL4n9wx.js";import{n as ut}from"./vega-loader.browser-C8wT63Va.js";import{t as ft}from"./react-vega-CXIQBUis.js";import"./defaultLocale-BLUna9fQ.js";import"./defaultLocale-DzliDDTm.js";import{r as dt,t as ht}from"./alert-yTS3WpF4.js";import{n as gt}from"./error-banner-LdWZDbqd.js";import{t as yt}from"./formats-b7Sf6DAK.js";import{n as vt}from"./useAsyncData-bgszE9F0.js";import{t as F}from"./useDeepCompareMemoize-zUHU--0D.js";import{t as kt}from"./semaphore-FlZezxaf.js";var bt=tt(),S=Z(Y(),1);function wt(t){return t.data&&"url"in t.data&&(t.data.url=H(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var W=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(W.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!W.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},v={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:v.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:v.interval(e),select:{type:"interval",encodings:D(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:v.point(e),select:{type:"point",encodings:D(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:v.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:v.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:v.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function D(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=St(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function St(t){var a,i;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(i=t.encoding)==null?void 0:i.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function xt(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function G(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,i]=n;return!i||!At.has(a)?[]:"field"in i&&typeof i.field=="string"?[i.field]:"condition"in i&&i.condition&&typeof i.condition=="object"&&"field"in i.condition&&i.condition.field&&typeof i.condition.field=="string"?[i.condition.field]:[]}):[]}var At=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function $(t,e,n,a){let i=n.filter(o=>v.isBinColoring(o)),r={and:(i.length>0?i:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:r,value:o},value:o/5}}}else return e}function _t(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function q(t){let e=E(t);if(e.length===0)return t;let n=jt(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function jt(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:i}of t){let r=new Set;for(let o of i){let s=_t(o);r.has(s)||(r.add(s),e.has(s)||e.set(s,{count:0,param:o}),e.get(s).count++)}}let a=[];for(let[,{count:i,param:r}]of e)i===n&&a.push(r);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let i of n){if(!i||typeof i!="object"||!("name"in i)){a.push(i);continue}e.has(i.name)||a.push(i)}if(a.length===0){let{params:i,...r}=t;return r}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",t.encoding||{},e,t.mark)}:t}function T(t,e){var s,h;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(s=t.params)!=null&&s.some(l=>l.bind==="legend")&&(a=!1);let i=(h=t.params)==null?void 0:h.some(l=>!l.bind);i&&(n=!1);let r="vconcat"in t||"hconcat"in t;if(i&&r)return t;if("vconcat"in t){let l=t.vconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,vconcat:l})}if("hconcat"in t){let l=t.hconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,hconcat:l})}if("layer"in t){let l=t.params&&t.params.length>0,m=a!==!1&&!l,k=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?G(f):[]);k=[...new Set(p)],Array.isArray(a)&&(k=k.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let g=p;if(f===0&&k.length>0){let O=k.map(M=>j.legend(M));g={...g,params:[...g.params||[],...O]}}return g=z(g,n,f),g=J(g),f===0&&(g=B(g)),g});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=Ot(o,a),o=z(o,n,void 0),o=J(o),o=B(o),o}function Ot(t,e){if(e===!1)return t;let n=G(t);Array.isArray(e)&&(n=n.filter(r=>e.includes(r)));let a=n.map(r=>j.legend(r)),i=[...t.params||[],...a];return{...t,params:i}}function z(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let i=xt(t),r=e===!0?i.length>0?["point"]:Mt(a):[e];if(!r||r.length===0)return t;let o=r.map(h=>h==="interval"?j.interval(t,n):j.point(t,n)),s=[...t.params||[],...o];return i.length>0&&r.includes("point")&&s.push(j.binColoring(n)),{...t,params:s}}function B(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function J(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(i=>i.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",e||{},a,t.mark)}}function Mt(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}var Nt=5;async function Pt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=new kt(Nt),a=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(a));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(a));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(a));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await a(r.spec)}),!r.data||!("url"in r.data))return r;let o;try{o=H(r.data.url)}catch{return r}let s=r.data.format,h=await n.run(()=>st(o.href,s));return e[o.pathname]=h,{...r,data:{name:o.pathname}}},i=await a(t);return Object.keys(e).length===0?i:{...i,datasets:e}}var d=Z(rt(),1);ut("arrow",yt);var It=t=>{let e=(0,bt.c)(12),{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:o,embedOptions:s}=t,h,l;e[0]===o?(h=e[1],l=e[2]):(h=async()=>Pt(o),l=[o],e[0]=o,e[1]=h,e[2]=l);let{data:m,error:k}=vt(h,l);if(k){let p;return e[3]===k?p=e[4]:(p=(0,d.jsx)(gt,{error:k}),e[3]=k,e[4]=p),p}if(!m)return null;let w;return e[5]!==i||e[6]!==s||e[7]!==r||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Ct,{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:m,embedOptions:s}),e[5]=i,e[6]=s,e[7]=r,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Ct=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:i,embedOptions:r})=>{let{theme:o}=lt(),s=(0,S.useRef)(null),h=(0,S.useRef)(void 0),[l,m]=(0,S.useState)(),k=(0,S.useMemo)(()=>r&&"actions"in r?r.actions:{source:!1,compiled:!1},[r]),w=F(i),p=(0,S.useMemo)(()=>T(wt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),g=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,y)=>{_.debug("[Vega signal]",c,y);let b=V.mapValues(y,Kt);b=V.mapValues(b,Et),g({[c]:b})},100),[g]),M=F(f),I=(0,S.useMemo)(()=>M.reduce((c,y)=>(v.PAN_ZOOM===y||v.isBinColoring(y)||c.push({signalName:y,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),R=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),h.current=c,m(void 0)}),U=()=>{let c=[];return v.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),v.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),v.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),v.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((y,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[y[0],":"]})," ",y[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:s,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:k,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:R,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.addSignalListener(c,y)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.removeSignalListener(c,y)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[l&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:l.message}),(0,d.jsx)("div",{className:"text-md",children:l.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:s,"data-container-width":pt(p)}),U()]})]})};function Et(t){return t instanceof Set?[...t]:t}function Kt(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Lt=It;export{Lt as default};
|
package/dist/index.html
CHANGED
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
|
|
67
67
|
<!-- /TODO -->
|
|
68
68
|
<title>{{ title }}</title>
|
|
69
|
-
<script type="module" crossorigin src="./assets/index-
|
|
69
|
+
<script type="module" crossorigin src="./assets/index-awsLWRjZ.js"></script>
|
|
70
70
|
<link rel="modulepreload" crossorigin href="./assets/preload-helper-BPPi7vOr.js">
|
|
71
71
|
<link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
|
|
72
72
|
<link rel="modulepreload" crossorigin href="./assets/react-Bj1aDYRI.js">
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
<link rel="modulepreload" crossorigin href="./assets/DeferredRequestRegistry-CNldVcrP.js">
|
|
105
105
|
<link rel="modulepreload" crossorigin href="./assets/constants-DMpttj8Q.js">
|
|
106
106
|
<link rel="modulepreload" crossorigin href="./assets/session-0B5NBztP.js">
|
|
107
|
-
<link rel="modulepreload" crossorigin href="./assets/config-
|
|
107
|
+
<link rel="modulepreload" crossorigin href="./assets/config-ClMcu_sV.js">
|
|
108
108
|
<link rel="modulepreload" crossorigin href="./assets/requests-DIwGYs0l.js">
|
|
109
109
|
<link rel="modulepreload" crossorigin href="./assets/useLifecycle-DieWOfXE.js">
|
|
110
110
|
<link rel="modulepreload" crossorigin href="./assets/useNonce-DfoVjkkH.js">
|
|
@@ -133,7 +133,7 @@
|
|
|
133
133
|
<link rel="modulepreload" crossorigin href="./assets/debounce-DhnxH9Rh.js">
|
|
134
134
|
<link rel="modulepreload" crossorigin href="./assets/database-zap-kIkTfzTX.js">
|
|
135
135
|
<link rel="modulepreload" crossorigin href="./assets/main-B0OX4z33.js">
|
|
136
|
-
<link rel="modulepreload" crossorigin href="./assets/cells-
|
|
136
|
+
<link rel="modulepreload" crossorigin href="./assets/cells-BsaJrRWi.js">
|
|
137
137
|
<link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DyYDV0HI.js">
|
|
138
138
|
<link rel="modulepreload" crossorigin href="./assets/kbd-CTUAEnEx.js">
|
|
139
139
|
<link rel="modulepreload" crossorigin href="./assets/useInstallPackage-DUF4IRRI.js">
|
|
@@ -147,35 +147,35 @@
|
|
|
147
147
|
<link rel="modulepreload" crossorigin href="./assets/usePress-DQ_tAz5W.js">
|
|
148
148
|
<link rel="modulepreload" crossorigin href="./assets/input-C3Hrdlqq.js">
|
|
149
149
|
<link rel="modulepreload" crossorigin href="./assets/ImperativeModal-B3Th7k4R.js">
|
|
150
|
-
<link rel="modulepreload" crossorigin href="./assets/cell-link-
|
|
150
|
+
<link rel="modulepreload" crossorigin href="./assets/cell-link-B1pHtGWp.js">
|
|
151
151
|
<link rel="modulepreload" crossorigin href="./assets/multi-map-CUuNtzHt.js">
|
|
152
152
|
<link rel="modulepreload" crossorigin href="./assets/alert-yTS3WpF4.js">
|
|
153
153
|
<link rel="modulepreload" crossorigin href="./assets/chevron-right-CG5QYXYk.js">
|
|
154
154
|
<link rel="modulepreload" crossorigin href="./assets/dropdown-menu-CR7cnzLX.js">
|
|
155
155
|
<link rel="modulepreload" crossorigin href="./assets/links-D1JoyKTt.js">
|
|
156
|
-
<link rel="modulepreload" crossorigin href="./assets/useRunCells-
|
|
156
|
+
<link rel="modulepreload" crossorigin href="./assets/useRunCells-BiCBGyeW.js">
|
|
157
157
|
<link rel="modulepreload" crossorigin href="./assets/copy-LK56fFow.js">
|
|
158
158
|
<link rel="modulepreload" crossorigin href="./assets/copy-BwrPA9zQ.js">
|
|
159
159
|
<link rel="modulepreload" crossorigin href="./assets/copy-icon-OjtDb4gO.js">
|
|
160
|
-
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-
|
|
161
|
-
<link rel="modulepreload" crossorigin href="./assets/datasource-
|
|
162
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
160
|
+
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-ChwPJgPd.js">
|
|
161
|
+
<link rel="modulepreload" crossorigin href="./assets/datasource-DjDpJnbt.js">
|
|
162
|
+
<link rel="modulepreload" crossorigin href="./assets/state-D-2KaAHK.js">
|
|
163
163
|
<link rel="modulepreload" crossorigin href="./assets/package-Tv6ztuzw.js">
|
|
164
164
|
<link rel="modulepreload" crossorigin href="./assets/sparkles-lWUAsPhp.js">
|
|
165
|
-
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-
|
|
165
|
+
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-B0h5OVW9.js">
|
|
166
166
|
<link rel="modulepreload" crossorigin href="./assets/spinner-Bhir8k53.js">
|
|
167
|
-
<link rel="modulepreload" crossorigin href="./assets/html-to-image-
|
|
168
|
-
<link rel="modulepreload" crossorigin href="./assets/focus-
|
|
167
|
+
<link rel="modulepreload" crossorigin href="./assets/html-to-image-BWL3Ct4n.js">
|
|
168
|
+
<link rel="modulepreload" crossorigin href="./assets/focus-q38vUCl-.js">
|
|
169
169
|
<link rel="modulepreload" crossorigin href="./assets/useAsyncData-bgszE9F0.js">
|
|
170
170
|
<link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-BEvXb3VX.js">
|
|
171
171
|
<link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-BygYYKhs.js">
|
|
172
172
|
<link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-D9iBG0F7.js">
|
|
173
|
-
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-
|
|
173
|
+
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-CU5Lbyax.js">
|
|
174
174
|
<link rel="modulepreload" crossorigin href="./assets/command-KARR7KMq.js">
|
|
175
175
|
<link rel="modulepreload" crossorigin href="./assets/field-zLmMOSA4.js">
|
|
176
176
|
<link rel="modulepreload" crossorigin href="./assets/popover-Bz_0Vkyf.js">
|
|
177
177
|
<link rel="modulepreload" crossorigin href="./assets/errors-vr57w7Ul.js">
|
|
178
|
-
<link rel="modulepreload" crossorigin href="./assets/download-
|
|
178
|
+
<link rel="modulepreload" crossorigin href="./assets/download-DT8gf0PL.js">
|
|
179
179
|
<link rel="modulepreload" crossorigin href="./assets/table-BGPSHfig.js">
|
|
180
180
|
<link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-CcI1zSdn.js">
|
|
181
181
|
<link rel="modulepreload" crossorigin href="./assets/error-banner-LdWZDbqd.js">
|
|
@@ -196,40 +196,40 @@
|
|
|
196
196
|
<link rel="modulepreload" crossorigin href="./assets/plus-BgB18UzY.js">
|
|
197
197
|
<link rel="modulepreload" crossorigin href="./assets/trash-2-rVklqqFF.js">
|
|
198
198
|
<link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-CV8-hvjx.js">
|
|
199
|
-
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-
|
|
199
|
+
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-BJaeXQim.js">
|
|
200
200
|
<link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-nqk474t8.js">
|
|
201
201
|
<link rel="modulepreload" crossorigin href="./assets/square-function-uY_yJr5g.js">
|
|
202
202
|
<link rel="modulepreload" crossorigin href="./assets/spec-CPQR_o92.js">
|
|
203
203
|
<link rel="modulepreload" crossorigin href="./assets/ellipsis-vertical-CkwWkOQL.js">
|
|
204
204
|
<link rel="modulepreload" crossorigin href="./assets/refresh-cw-DHwG4Mac.js">
|
|
205
205
|
<link rel="modulepreload" crossorigin href="./assets/tree-actions-BM_EJr3E.js">
|
|
206
|
-
<link rel="modulepreload" crossorigin href="./assets/components-
|
|
207
|
-
<link rel="modulepreload" crossorigin href="./assets/column-preview-
|
|
206
|
+
<link rel="modulepreload" crossorigin href="./assets/components-BzBUxUz0.js">
|
|
207
|
+
<link rel="modulepreload" crossorigin href="./assets/column-preview-BPismotx.js">
|
|
208
208
|
<link rel="modulepreload" crossorigin href="./assets/icons-Ol38nIbL.js">
|
|
209
|
-
<link rel="modulepreload" crossorigin href="./assets/radio-group-
|
|
210
|
-
<link rel="modulepreload" crossorigin href="./assets/floating-outline-
|
|
209
|
+
<link rel="modulepreload" crossorigin href="./assets/radio-group-DlVSuZ_1.js">
|
|
210
|
+
<link rel="modulepreload" crossorigin href="./assets/floating-outline-BN9sAcQ0.js">
|
|
211
211
|
<link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-DfWeGRFv.js">
|
|
212
212
|
<link rel="modulepreload" crossorigin href="./assets/esm-CqWdmSnV.js">
|
|
213
|
-
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-
|
|
213
|
+
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-D3_kHsDx.js">
|
|
214
214
|
<link rel="modulepreload" crossorigin href="./assets/file-headphone-BrQspHac.js">
|
|
215
215
|
<link rel="modulepreload" crossorigin href="./assets/file-BrdxGLRX.js">
|
|
216
216
|
<link rel="modulepreload" crossorigin href="./assets/image-DQHXdEQn.js">
|
|
217
|
-
<link rel="modulepreload" crossorigin href="./assets/file-icons-
|
|
218
|
-
<link rel="modulepreload" crossorigin href="./assets/switch-
|
|
217
|
+
<link rel="modulepreload" crossorigin href="./assets/file-icons-BiMOJy0r.js">
|
|
218
|
+
<link rel="modulepreload" crossorigin href="./assets/switch-BiU_sAcn.js">
|
|
219
219
|
<link rel="modulepreload" crossorigin href="./assets/events-CPoJAfgx.js">
|
|
220
|
-
<link rel="modulepreload" crossorigin href="./assets/globals-
|
|
220
|
+
<link rel="modulepreload" crossorigin href="./assets/globals-7JnRMGd4.js">
|
|
221
221
|
<link rel="modulepreload" crossorigin href="./assets/share-DMwTZOTH.js">
|
|
222
222
|
<link rel="modulepreload" crossorigin href="./assets/blob-Bgnx1kuY.js">
|
|
223
223
|
<link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
|
|
224
224
|
<link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
|
|
225
225
|
<link rel="modulepreload" crossorigin href="./assets/_baseSet-CxV9N1bc.js">
|
|
226
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
226
|
+
<link rel="modulepreload" crossorigin href="./assets/state-BTTshiKq.js">
|
|
227
227
|
<link rel="modulepreload" crossorigin href="./assets/label-xHqFtfdz.js">
|
|
228
|
-
<link rel="modulepreload" crossorigin href="./assets/textarea-
|
|
228
|
+
<link rel="modulepreload" crossorigin href="./assets/textarea-DwltG8V6.js">
|
|
229
229
|
<link rel="modulepreload" crossorigin href="./assets/refresh-ccw-C-n2VFP5.js">
|
|
230
|
-
<link rel="modulepreload" crossorigin href="./assets/form-
|
|
230
|
+
<link rel="modulepreload" crossorigin href="./assets/form-BtBTvVVd.js">
|
|
231
231
|
<link rel="modulepreload" crossorigin href="./assets/renderShortcut-CcFk3m01.js">
|
|
232
|
-
<link rel="modulepreload" crossorigin href="./assets/useBoolean-
|
|
232
|
+
<link rel="modulepreload" crossorigin href="./assets/useBoolean-Bp18o6XG.js">
|
|
233
233
|
<link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-zUHU--0D.js">
|
|
234
234
|
<link rel="modulepreload" crossorigin href="./assets/types-W8WWuumF.js">
|
|
235
235
|
<link rel="modulepreload" crossorigin href="./assets/semaphore-FlZezxaf.js">
|
|
@@ -248,7 +248,7 @@
|
|
|
248
248
|
<link rel="stylesheet" crossorigin href="./assets/cells-jmgGt1lS.css">
|
|
249
249
|
<link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DdDKmWlR.css">
|
|
250
250
|
<link rel="stylesheet" crossorigin href="./assets/JsonOutput-B7vuddcd.css">
|
|
251
|
-
<link rel="stylesheet" crossorigin href="./assets/index-
|
|
251
|
+
<link rel="stylesheet" crossorigin href="./assets/index-BIw7BKLH.css">
|
|
252
252
|
</head>
|
|
253
253
|
<body>
|
|
254
254
|
<div id="root"></div>
|
package/package.json
CHANGED
|
@@ -1,69 +1,10 @@
|
|
|
1
1
|
/* Copyright 2026 Marimo. All rights reserved. */
|
|
2
2
|
|
|
3
|
-
import { ArrowRightSquareIcon } from "lucide-react";
|
|
4
|
-
import { API } from "@/core/network/api";
|
|
5
|
-
import { Banner } from "@/plugins/impl/common/error-banner";
|
|
6
|
-
import { prettyError } from "@/utils/errors";
|
|
7
|
-
import { reloadSafe } from "@/utils/reload-safe";
|
|
8
|
-
import { Button } from "../ui/button";
|
|
9
|
-
import { toast } from "../ui/use-toast";
|
|
10
|
-
|
|
11
3
|
interface DisconnectedProps {
|
|
12
4
|
reason: string;
|
|
13
|
-
canTakeover: boolean | undefined;
|
|
14
5
|
}
|
|
15
6
|
|
|
16
|
-
export const Disconnected = ({
|
|
17
|
-
reason,
|
|
18
|
-
canTakeover = false,
|
|
19
|
-
}: DisconnectedProps) => {
|
|
20
|
-
const handleTakeover = async () => {
|
|
21
|
-
try {
|
|
22
|
-
const searchParams = new URL(window.location.href).searchParams;
|
|
23
|
-
await API.post(`/kernel/takeover?${searchParams.toString()}`, {});
|
|
24
|
-
|
|
25
|
-
// Refresh the page to reconnect
|
|
26
|
-
reloadSafe();
|
|
27
|
-
} catch (error) {
|
|
28
|
-
toast({
|
|
29
|
-
title: "Failed to take over session",
|
|
30
|
-
description: prettyError(error),
|
|
31
|
-
variant: "danger",
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
|
|
36
|
-
if (canTakeover) {
|
|
37
|
-
return (
|
|
38
|
-
<div className="flex justify-center">
|
|
39
|
-
<Banner
|
|
40
|
-
kind="info"
|
|
41
|
-
className="mt-10 flex flex-col rounded p-3 max-w-[800px] mx-4"
|
|
42
|
-
>
|
|
43
|
-
<div className="flex justify-between">
|
|
44
|
-
<span className="font-bold text-xl flex items-center mb-2">
|
|
45
|
-
Notebook already connected
|
|
46
|
-
</span>
|
|
47
|
-
</div>
|
|
48
|
-
<div className="flex justify-between items-end text-base gap-20">
|
|
49
|
-
<span>{reason}</span>
|
|
50
|
-
{canTakeover && (
|
|
51
|
-
<Button
|
|
52
|
-
onClick={handleTakeover}
|
|
53
|
-
variant="outline"
|
|
54
|
-
data-testid="takeover-button"
|
|
55
|
-
className="shrink-0"
|
|
56
|
-
>
|
|
57
|
-
<ArrowRightSquareIcon className="w-4 h-4 mr-2" />
|
|
58
|
-
Take over session
|
|
59
|
-
</Button>
|
|
60
|
-
)}
|
|
61
|
-
</div>
|
|
62
|
-
</Banner>
|
|
63
|
-
</div>
|
|
64
|
-
);
|
|
65
|
-
}
|
|
66
|
-
|
|
7
|
+
export const Disconnected = ({ reason }: DisconnectedProps) => {
|
|
67
8
|
return (
|
|
68
9
|
<div className="font-mono text-center text-base text-(--red-11)">
|
|
69
10
|
<p>{reason}</p>
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/* Copyright 2026 Marimo. All rights reserved. */
|
|
2
|
+
import { render, screen } from "@testing-library/react";
|
|
3
|
+
import { createStore, Provider } from "jotai";
|
|
4
|
+
import { describe, expect, it, vi } from "vitest";
|
|
5
|
+
import { TooltipProvider } from "@/components/ui/tooltip";
|
|
6
|
+
import { layoutStateAtom } from "@/core/layout/layout";
|
|
7
|
+
import { kioskModeAtom, viewStateAtom } from "@/core/mode";
|
|
8
|
+
import { API } from "@/core/network/api";
|
|
9
|
+
import { ViewerBanner } from "../viewer-banner";
|
|
10
|
+
|
|
11
|
+
describe("ViewerBanner", () => {
|
|
12
|
+
it("renders nothing when not in kiosk mode", () => {
|
|
13
|
+
const store = createStore();
|
|
14
|
+
store.set(kioskModeAtom, false);
|
|
15
|
+
const { container } = render(
|
|
16
|
+
<Provider store={store}>
|
|
17
|
+
<TooltipProvider>
|
|
18
|
+
<ViewerBanner />
|
|
19
|
+
</TooltipProvider>
|
|
20
|
+
</Provider>,
|
|
21
|
+
);
|
|
22
|
+
expect(container).toBeEmptyDOMElement();
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it("renders nothing for an intentional kiosk client (?kiosk=true)", () => {
|
|
26
|
+
const store = createStore();
|
|
27
|
+
store.set(kioskModeAtom, true);
|
|
28
|
+
window.history.pushState({}, "", "/?kiosk=true");
|
|
29
|
+
try {
|
|
30
|
+
const { container } = render(
|
|
31
|
+
<Provider store={store}>
|
|
32
|
+
<TooltipProvider>
|
|
33
|
+
<ViewerBanner />
|
|
34
|
+
</TooltipProvider>
|
|
35
|
+
</Provider>,
|
|
36
|
+
);
|
|
37
|
+
expect(container).toBeEmptyDOMElement();
|
|
38
|
+
} finally {
|
|
39
|
+
window.history.pushState({}, "", "/");
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it("renders nothing in a non-vertical layout (grid/slides)", () => {
|
|
44
|
+
const store = createStore();
|
|
45
|
+
store.set(kioskModeAtom, true);
|
|
46
|
+
store.set(layoutStateAtom, { selectedLayout: "grid", layoutData: {} });
|
|
47
|
+
const { container } = render(
|
|
48
|
+
<Provider store={store}>
|
|
49
|
+
<TooltipProvider>
|
|
50
|
+
<ViewerBanner />
|
|
51
|
+
</TooltipProvider>
|
|
52
|
+
</Provider>,
|
|
53
|
+
);
|
|
54
|
+
expect(container).toBeEmptyDOMElement();
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("renders nothing in present mode", () => {
|
|
58
|
+
const store = createStore();
|
|
59
|
+
store.set(kioskModeAtom, true);
|
|
60
|
+
store.set(viewStateAtom, { mode: "present", cellAnchor: null });
|
|
61
|
+
const { container } = render(
|
|
62
|
+
<Provider store={store}>
|
|
63
|
+
<TooltipProvider>
|
|
64
|
+
<ViewerBanner />
|
|
65
|
+
</TooltipProvider>
|
|
66
|
+
</Provider>,
|
|
67
|
+
);
|
|
68
|
+
expect(container).toBeEmptyDOMElement();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it("shows take over and posts without reload when viewing", () => {
|
|
72
|
+
const store = createStore();
|
|
73
|
+
store.set(kioskModeAtom, true);
|
|
74
|
+
const post = vi.spyOn(API, "post").mockResolvedValue({} as never);
|
|
75
|
+
render(
|
|
76
|
+
<Provider store={store}>
|
|
77
|
+
<TooltipProvider>
|
|
78
|
+
<ViewerBanner />
|
|
79
|
+
</TooltipProvider>
|
|
80
|
+
</Provider>,
|
|
81
|
+
);
|
|
82
|
+
const button = screen.getByTestId("takeover-button");
|
|
83
|
+
button.click();
|
|
84
|
+
expect(post).toHaveBeenCalledWith(
|
|
85
|
+
expect.stringContaining("/kernel/takeover"),
|
|
86
|
+
{},
|
|
87
|
+
);
|
|
88
|
+
});
|
|
89
|
+
});
|
|
@@ -90,19 +90,4 @@ describe("StatusOverlay disconnect indicator", () => {
|
|
|
90
90
|
expect(onReconnect).not.toHaveBeenCalled();
|
|
91
91
|
},
|
|
92
92
|
);
|
|
93
|
-
|
|
94
|
-
it("does not render the disconnect icon when another tab has taken over", () => {
|
|
95
|
-
const onReconnect = vi.fn();
|
|
96
|
-
const { queryByTestId } = renderOverlay(
|
|
97
|
-
{
|
|
98
|
-
state: WebSocketState.CLOSED,
|
|
99
|
-
code: WebSocketClosedReason.ALREADY_RUNNING,
|
|
100
|
-
reason: "another browser tab is already connected to the kernel",
|
|
101
|
-
canTakeover: true,
|
|
102
|
-
},
|
|
103
|
-
onReconnect,
|
|
104
|
-
);
|
|
105
|
-
|
|
106
|
-
expect(queryByTestId("disconnected-indicator")).toBeNull();
|
|
107
|
-
});
|
|
108
93
|
});
|
|
@@ -18,10 +18,7 @@ export const AppHeader: React.FC<PropsWithChildren<Props>> = ({
|
|
|
18
18
|
<div className={className}>
|
|
19
19
|
{children}
|
|
20
20
|
{connection.state === WebSocketState.CLOSED && (
|
|
21
|
-
<Disconnected
|
|
22
|
-
reason={connection.reason}
|
|
23
|
-
canTakeover={connection.canTakeover}
|
|
24
|
-
/>
|
|
21
|
+
<Disconnected reason={connection.reason} />
|
|
25
22
|
)}
|
|
26
23
|
</div>
|
|
27
24
|
);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* Copyright 2026 Marimo. All rights reserved. */
|
|
2
2
|
|
|
3
3
|
import { useAtomValue } from "jotai";
|
|
4
|
-
import { HourglassIcon,
|
|
4
|
+
import { HourglassIcon, UnlinkIcon } from "lucide-react";
|
|
5
5
|
import React from "react";
|
|
6
6
|
import { Tooltip } from "@/components/ui/tooltip";
|
|
7
7
|
import { notebookScrollToRunning } from "@/core/cells/actions";
|
|
@@ -24,13 +24,13 @@ export const StatusOverlay: React.FC<{
|
|
|
24
24
|
const isOpen = connection.state === WebSocketState.OPEN;
|
|
25
25
|
// Only KERNEL_DISCONNECTED is recoverable by a retry. Other terminal
|
|
26
26
|
// reasons (MALFORMED_QUERY, KERNEL_STARTUP_ERROR) would deterministically
|
|
27
|
-
// fail the same way
|
|
27
|
+
// fail the same way.
|
|
28
28
|
const canReconnect =
|
|
29
29
|
isClosed && connection.code === WebSocketClosedReason.KERNEL_DISCONNECTED;
|
|
30
30
|
|
|
31
31
|
return (
|
|
32
32
|
<>
|
|
33
|
-
{isClosed &&
|
|
33
|
+
{isClosed && <NoiseBackground />}
|
|
34
34
|
<div
|
|
35
35
|
className={cn(
|
|
36
36
|
"z-50 top-4 left-4",
|
|
@@ -38,12 +38,11 @@ export const StatusOverlay: React.FC<{
|
|
|
38
38
|
)}
|
|
39
39
|
>
|
|
40
40
|
{isOpen && isRunning && <RunningIcon />}
|
|
41
|
-
{isClosed &&
|
|
41
|
+
{isClosed && (
|
|
42
42
|
<DisconnectedIcon
|
|
43
43
|
onReconnect={canReconnect ? onReconnect : undefined}
|
|
44
44
|
/>
|
|
45
45
|
)}
|
|
46
|
-
{isClosed && connection.canTakeover && <LockedIcon />}
|
|
47
46
|
</div>
|
|
48
47
|
</>
|
|
49
48
|
);
|
|
@@ -79,14 +78,6 @@ const DisconnectedIcon: React.FC<{ onReconnect?: () => void }> = ({
|
|
|
79
78
|
);
|
|
80
79
|
};
|
|
81
80
|
|
|
82
|
-
const LockedIcon = () => (
|
|
83
|
-
<Tooltip content="Notebook locked">
|
|
84
|
-
<div className={topLeftStatus}>
|
|
85
|
-
<LockIcon className="w-[25px] h-[25px] text-(--blue-11)" />
|
|
86
|
-
</div>
|
|
87
|
-
</Tooltip>
|
|
88
|
-
);
|
|
89
|
-
|
|
90
81
|
const RunningIcon = () => {
|
|
91
82
|
const scratchpadOnly = useAtomValue(onlyScratchpadIsRunningAtom);
|
|
92
83
|
const tooltip = scratchpadOnly
|
|
@@ -26,8 +26,9 @@ const layoutOf = (entries: Array<[string, SlideConfig]>): SlidesLayout => ({
|
|
|
26
26
|
describe("computeSlideCellsInfo", () => {
|
|
27
27
|
it("returns empty results for empty input", () => {
|
|
28
28
|
const result = computeSlideCellsInfo([], layoutOf([]));
|
|
29
|
-
expect(result.
|
|
29
|
+
expect(result.slideCells).toEqual([]);
|
|
30
30
|
expect(result.skippedIds.size).toBe(0);
|
|
31
|
+
expect(result.noOutputIds.size).toBe(0);
|
|
31
32
|
expect(result.slideTypes.size).toBe(0);
|
|
32
33
|
expect(result.startCellIndex).toBe(0);
|
|
33
34
|
});
|
|
@@ -62,22 +63,26 @@ describe("computeSlideCellsInfo", () => {
|
|
|
62
63
|
expect(result.startCellIndex).toBe(0);
|
|
63
64
|
});
|
|
64
65
|
|
|
65
|
-
it("
|
|
66
|
+
it("keeps cells with no output for the minimap", () => {
|
|
66
67
|
const result = computeSlideCellsInfo(
|
|
67
68
|
[cell("a"), cell("b", null), cell("c")],
|
|
68
69
|
layoutOf([]),
|
|
69
70
|
);
|
|
70
|
-
expect(result.
|
|
71
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["a", "b", "c"]);
|
|
72
|
+
expect([...result.noOutputIds]).toEqual(["b"]);
|
|
73
|
+
expect([...result.skippedIds]).toEqual(["b"]);
|
|
71
74
|
});
|
|
72
75
|
|
|
73
|
-
it("
|
|
76
|
+
it("keeps cells whose output data is empty string for the minimap", () => {
|
|
74
77
|
// Mirrors the editor contract: an explicit empty-string payload means the
|
|
75
|
-
// cell rendered nothing, so it should not occupy a slide.
|
|
78
|
+
// cell rendered nothing, so it should not occupy a reveal slide.
|
|
76
79
|
const result = computeSlideCellsInfo(
|
|
77
80
|
[cell("a"), cell("b", { data: "" }), cell("c")],
|
|
78
81
|
layoutOf([]),
|
|
79
82
|
);
|
|
80
|
-
expect(result.
|
|
83
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["a", "b", "c"]);
|
|
84
|
+
expect([...result.noOutputIds]).toEqual(["b"]);
|
|
85
|
+
expect([...result.skippedIds]).toEqual(["b"]);
|
|
81
86
|
});
|
|
82
87
|
|
|
83
88
|
it("keeps cells whose output data is a non-empty value (including falsy ones)", () => {
|
|
@@ -91,7 +96,8 @@ describe("computeSlideCellsInfo", () => {
|
|
|
91
96
|
],
|
|
92
97
|
layoutOf([]),
|
|
93
98
|
);
|
|
94
|
-
expect(result.
|
|
99
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["a", "b", "c"]);
|
|
100
|
+
expect(result.noOutputIds.size).toBe(0);
|
|
95
101
|
});
|
|
96
102
|
|
|
97
103
|
it("populates slideTypes only for cells with an explicit type", () => {
|
|
@@ -121,14 +127,12 @@ describe("computeSlideCellsInfo", () => {
|
|
|
121
127
|
expect([...result.skippedIds]).toEqual(["b", "c"]);
|
|
122
128
|
// Skipped cells are still "visible" deck cells — they just aren't rendered
|
|
123
129
|
// in reveal. The minimap relies on the full list plus skippedIds.
|
|
124
|
-
expect(result.
|
|
130
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["a", "b", "c"]);
|
|
125
131
|
expect(result.slideTypes.get(cellId("b"))).toBe("skip");
|
|
126
132
|
});
|
|
127
133
|
|
|
128
|
-
it("
|
|
129
|
-
//
|
|
130
|
-
// the user deleted its code), it should drop out of both maps — otherwise
|
|
131
|
-
// the skip set would reference ghosts.
|
|
134
|
+
it("preserves configured slide types for cells that have no output", () => {
|
|
135
|
+
// The missing output is transient runtime state, not persisted slide config.
|
|
132
136
|
const result = computeSlideCellsInfo(
|
|
133
137
|
[cell("a"), cell("b", null)],
|
|
134
138
|
layoutOf([
|
|
@@ -136,16 +140,25 @@ describe("computeSlideCellsInfo", () => {
|
|
|
136
140
|
["b", { type: "skip" }],
|
|
137
141
|
]),
|
|
138
142
|
);
|
|
139
|
-
expect(result.
|
|
140
|
-
expect(result.
|
|
141
|
-
expect(result.
|
|
143
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["a", "b"]);
|
|
144
|
+
expect([...result.noOutputIds]).toEqual(["b"]);
|
|
145
|
+
expect([...result.skippedIds]).toEqual(["b"]);
|
|
146
|
+
expect(result.slideTypes.get(cellId("b"))).toBe("skip");
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
it("skips no-output cells when computing the starting cell", () => {
|
|
150
|
+
const result = computeSlideCellsInfo(
|
|
151
|
+
[cell("a", null), cell("b", { data: "" }), cell("c")],
|
|
152
|
+
layoutOf([]),
|
|
153
|
+
);
|
|
154
|
+
expect(result.startCellIndex).toBe(2);
|
|
142
155
|
});
|
|
143
156
|
|
|
144
|
-
it("preserves the input order of cells in
|
|
157
|
+
it("preserves the input order of cells in slideCells", () => {
|
|
145
158
|
const result = computeSlideCellsInfo(
|
|
146
159
|
[cell("c"), cell("a"), cell("b")],
|
|
147
160
|
layoutOf([]),
|
|
148
161
|
);
|
|
149
|
-
expect(result.
|
|
162
|
+
expect(result.slideCells.map((c) => c.id)).toEqual(["c", "a", "b"]);
|
|
150
163
|
});
|
|
151
164
|
});
|
|
@@ -9,32 +9,40 @@ export interface SlideCellLike {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export interface SlideCellsInfo<T extends SlideCellLike> {
|
|
12
|
-
|
|
12
|
+
slideCells: T[];
|
|
13
13
|
skippedIds: Set<CellId>;
|
|
14
|
+
noOutputIds: Set<CellId>;
|
|
14
15
|
slideTypes: Map<CellId, SlideType>;
|
|
15
|
-
// Index of the first cell in `
|
|
16
|
+
// Index of the first cell in `slideCells` that is not effectively skipped.
|
|
16
17
|
startCellIndex: number;
|
|
17
18
|
}
|
|
18
19
|
|
|
20
|
+
export function hasRenderableOutput(cell: SlideCellLike): boolean {
|
|
21
|
+
return cell.output != null && cell.output.data !== "";
|
|
22
|
+
}
|
|
23
|
+
|
|
19
24
|
export function computeSlideCellsInfo<T extends SlideCellLike>(
|
|
20
25
|
cells: readonly T[],
|
|
21
26
|
layout: Pick<SlidesLayout, "cells">,
|
|
22
27
|
): SlideCellsInfo<T> {
|
|
23
|
-
const
|
|
24
|
-
(cell) => cell.output != null && cell.output.data !== "",
|
|
25
|
-
);
|
|
28
|
+
const slideCells = [...cells];
|
|
26
29
|
const skippedIds = new Set<CellId>();
|
|
30
|
+
const noOutputIds = new Set<CellId>();
|
|
27
31
|
const slideTypes = new Map<CellId, SlideType>();
|
|
28
32
|
|
|
29
33
|
let startCell: T | null = null;
|
|
30
34
|
let startCellIndex = 0;
|
|
31
35
|
|
|
32
|
-
for (const [index, cell] of
|
|
36
|
+
for (const [index, cell] of slideCells.entries()) {
|
|
33
37
|
const type = layout.cells.get(cell.id)?.type;
|
|
38
|
+
const hasOutput = hasRenderableOutput(cell);
|
|
34
39
|
if (type) {
|
|
35
40
|
slideTypes.set(cell.id, type);
|
|
36
41
|
}
|
|
37
|
-
if (
|
|
42
|
+
if (!hasOutput) {
|
|
43
|
+
noOutputIds.add(cell.id);
|
|
44
|
+
}
|
|
45
|
+
if (type === "skip" || !hasOutput) {
|
|
38
46
|
skippedIds.add(cell.id);
|
|
39
47
|
} else if (startCell === null) {
|
|
40
48
|
startCell = cell;
|
|
@@ -42,8 +50,9 @@ export function computeSlideCellsInfo<T extends SlideCellLike>(
|
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
return {
|
|
45
|
-
|
|
53
|
+
slideCells,
|
|
46
54
|
skippedIds,
|
|
55
|
+
noOutputIds,
|
|
47
56
|
slideTypes,
|
|
48
57
|
startCellIndex,
|
|
49
58
|
};
|