@bendyline/docblocks-react 2.6.0 → 2.6.2

package/THIRD_PARTY_NOTICES.txt

@@ -15,14 +15,14 @@ This notice is included in the published npm tarball. Transitive packages instal
 | Package | Version | License | Source |
 | --- | --- | --- | --- |
 | @antfu/install-pkg | 1.1.0 | MIT | https://github.com/antfu/install-pkg |
-| @bendyline/squisq | 2.11.1 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq | 2.11.4 | MIT | https://github.com/bendyline/squisq |
 | @bendyline/squisq-calc | 2.11.0 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-editor-react | 2.11.1 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-formats | 2.6.1 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-grid-react | 2.11.2 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-react | 2.11.1 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-video | 2.3.4 | MIT | https://github.com/bendyline/squisq |
-| @bendyline/squisq-video-react | 2.4.5 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-editor-react | 2.11.4 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-formats | 2.6.4 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-grid-react | 2.11.5 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-react | 2.11.4 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-video | 2.3.7 | MIT | https://github.com/bendyline/squisq |
+| @bendyline/squisq-video-react | 2.4.8 | MIT | https://github.com/bendyline/squisq |
 | @braintree/sanitize-url | 7.1.2 | MIT | https://github.com/braintree/sanitize-url |
 | @chevrotain/types | 11.1.2 | Apache-2.0 | https://github.com/Chevrotain/chevrotain |
 | @ffmpeg/core | 0.12.9 | GPL-2.0-or-later | https://github.com/ffmpegwasm/ffmpeg.wasm |
@@ -431,7 +431,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 ==============================================================================
-Components: @bendyline/squisq-calc@2.11.0, @bendyline/squisq-editor-react@2.11.1, @bendyline/squisq-formats@2.6.1, @bendyline/squisq-grid-react@2.11.2, @bendyline/squisq-react@2.11.1, @bendyline/squisq-video-react@2.4.5, @bendyline/squisq-video@2.3.4, @bendyline/squisq@2.11.1
+Components: @bendyline/squisq-calc@2.11.0, @bendyline/squisq-editor-react@2.11.4, @bendyline/squisq-formats@2.6.4, @bendyline/squisq-grid-react@2.11.5, @bendyline/squisq-react@2.11.4, @bendyline/squisq-video-react@2.4.8, @bendyline/squisq-video@2.3.7, @bendyline/squisq@2.11.4
 Source files: node_modules/@bendyline/squisq-calc/LICENSE, node_modules/@bendyline/squisq-editor-react/LICENSE, node_modules/@bendyline/squisq-formats/LICENSE, node_modules/@bendyline/squisq-grid-react/LICENSE, node_modules/@bendyline/squisq-react/LICENSE, node_modules/@bendyline/squisq-video-react/LICENSE, node_modules/@bendyline/squisq-video/LICENSE, node_modules/@bendyline/squisq/LICENSE
 ==============================================================================
 MIT License
@@ -631,7 +631,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ==============================================================================
-Components: @bendyline/squisq-editor-react@2.11.1
+Components: @bendyline/squisq-editor-react@2.11.4
 Source files: node_modules/@bendyline/squisq-editor-react/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-editor-react
@@ -679,7 +679,7 @@ Exact third-party license texts for the bundled adapter, loader, state helper,
 and Font Awesome assets are shipped in THIRD_PARTY_LICENSES.txt.
 
 ==============================================================================
-Components: @bendyline/squisq-editor-react@2.11.1, @tiptap/core@2.27.2, @tiptap/extension-blockquote@2.27.2, @tiptap/extension-bold@2.27.2, @tiptap/extension-bubble-menu@2.27.2, @tiptap/extension-bullet-list@2.27.2, @tiptap/extension-code-block@2.27.2, @tiptap/extension-code@2.27.2, @tiptap/extension-document@2.27.2, @tiptap/extension-dropcursor@2.27.2, @tiptap/extension-floating-menu@2.27.2, @tiptap/extension-gapcursor@2.27.2, @tiptap/extension-hard-break@2.27.2, @tiptap/extension-heading@2.27.2, @tiptap/extension-history@2.27.2, @tiptap/extension-horizontal-rule@2.27.2, @tiptap/extension-image@2.27.2, @tiptap/extension-italic@2.27.2, @tiptap/extension-link@2.27.2, @tiptap/extension-list-item@2.27.2, @tiptap/extension-mention@2.27.2, @tiptap/extension-ordered-list@2.27.2, @tiptap/extension-paragraph@2.27.2, @tiptap/extension-placeholder@2.27.2, @tiptap/extension-strike@2.27.2, @tiptap/extension-table-cell@2.27.2, @tiptap/extension-table-header@2.27.2, @tiptap/extension-table-row@2.27.2, @tiptap/extension-table@2.27.2, @tiptap/extension-task-item@2.27.2, @tiptap/extension-task-list@2.27.2, @tiptap/extension-text-style@2.27.2, @tiptap/extension-text@2.27.2, @tiptap/pm@2.27.2, @tiptap/react@2.27.2, @tiptap/starter-kit@2.27.2, @tiptap/suggestion@2.27.2
+Components: @bendyline/squisq-editor-react@2.11.4, @tiptap/core@2.27.2, @tiptap/extension-blockquote@2.27.2, @tiptap/extension-bold@2.27.2, @tiptap/extension-bubble-menu@2.27.2, @tiptap/extension-bullet-list@2.27.2, @tiptap/extension-code-block@2.27.2, @tiptap/extension-code@2.27.2, @tiptap/extension-document@2.27.2, @tiptap/extension-dropcursor@2.27.2, @tiptap/extension-floating-menu@2.27.2, @tiptap/extension-gapcursor@2.27.2, @tiptap/extension-hard-break@2.27.2, @tiptap/extension-heading@2.27.2, @tiptap/extension-history@2.27.2, @tiptap/extension-horizontal-rule@2.27.2, @tiptap/extension-image@2.27.2, @tiptap/extension-italic@2.27.2, @tiptap/extension-link@2.27.2, @tiptap/extension-list-item@2.27.2, @tiptap/extension-mention@2.27.2, @tiptap/extension-ordered-list@2.27.2, @tiptap/extension-paragraph@2.27.2, @tiptap/extension-placeholder@2.27.2, @tiptap/extension-strike@2.27.2, @tiptap/extension-table-cell@2.27.2, @tiptap/extension-table-header@2.27.2, @tiptap/extension-table-row@2.27.2, @tiptap/extension-table@2.27.2, @tiptap/extension-task-item@2.27.2, @tiptap/extension-task-list@2.27.2, @tiptap/extension-text-style@2.27.2, @tiptap/extension-text@2.27.2, @tiptap/pm@2.27.2, @tiptap/react@2.27.2, @tiptap/starter-kit@2.27.2, @tiptap/suggestion@2.27.2
 Source files: node_modules/@bendyline/squisq-editor-react/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-editor-react
@@ -952,7 +952,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ==============================================================================
-Components: @bendyline/squisq-formats@2.6.1
+Components: @bendyline/squisq-formats@2.6.4
 Source files: node_modules/@bendyline/squisq-formats/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-formats
@@ -978,7 +978,7 @@ texts for these dependencies are included in their respective npm
 distributions and source repositories.
 
 ==============================================================================
-Components: @bendyline/squisq-formats@2.6.1
+Components: @bendyline/squisq-formats@2.6.4
 Source files: node_modules/@bendyline/squisq-formats/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-formats
@@ -1160,7 +1160,7 @@ Awesome, nor vice versa. **Please do not use brand logos for any purpose except
 to represent the company, product, or service to which they refer.**
 
 ==============================================================================
-Components: @bendyline/squisq-grid-react@2.11.2
+Components: @bendyline/squisq-grid-react@2.11.5
 Source files: node_modules/@bendyline/squisq-grid-react/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-grid-react
@@ -1181,7 +1181,7 @@ Copyright and complete license texts for these dependencies are included in
 their respective npm distributions and source repositories.
 
 ==============================================================================
-Components: @bendyline/squisq-grid-react@2.11.2
+Components: @bendyline/squisq-grid-react@2.11.5
 Source files: node_modules/@bendyline/squisq-grid-react/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-grid-react
@@ -1193,7 +1193,7 @@ repository license, the pinned upstream copy is vendored and identified below.
 COMPONENTS
 
 ==============================================================================
-Components: @bendyline/squisq-react@2.11.1
+Components: @bendyline/squisq-react@2.11.4
 Source files: node_modules/@bendyline/squisq-react/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-react
@@ -1218,7 +1218,7 @@ third-party license texts for the complete standalone bundle graph are shipped
 in THIRD_PARTY_LICENSES.txt.
 
 ==============================================================================
-Components: @bendyline/squisq-react@2.11.1
+Components: @bendyline/squisq-react@2.11.4
 Source files: node_modules/@bendyline/squisq-react/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-react
@@ -5691,7 +5691,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ==============================================================================
-Components: @bendyline/squisq-video-react@2.4.5, @ffmpeg/core@0.12.9
+Components: @bendyline/squisq-video-react@2.4.8, @ffmpeg/core@0.12.9
 Source files: node_modules/@bendyline/squisq-video-react/COPYING.GPL-2.0.txt
 ==============================================================================
                     GNU GENERAL PUBLIC LICENSE
@@ -6034,7 +6034,7 @@ library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
 
 ==============================================================================
-Components: @bendyline/squisq-video-react@2.4.5, @ffmpeg/core@0.12.9
+Components: @bendyline/squisq-video-react@2.4.8, @ffmpeg/core@0.12.9
 Source files: node_modules/@bendyline/squisq-video-react/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-video-react
@@ -6079,7 +6079,7 @@ global WebCodecs declaration dependencies are not installed for consumers. Its
 exact license text is shipped in THIRD_PARTY_LICENSES.txt.
 
 ==============================================================================
-Components: @bendyline/squisq-video-react@2.4.5, @ffmpeg/core@0.12.9, @ffmpeg/ffmpeg@0.12.15, @ffmpeg/types@0.12.4, @ffmpeg/util@0.12.2
+Components: @bendyline/squisq-video-react@2.4.8, @ffmpeg/core@0.12.9, @ffmpeg/ffmpeg@0.12.15, @ffmpeg/types@0.12.4, @ffmpeg/util@0.12.2
 Source files: node_modules/@bendyline/squisq-video-react/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-video-react
@@ -6143,7 +6143,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 ==============================================================================
-Components: @bendyline/squisq-video@2.3.4
+Components: @bendyline/squisq-video@2.3.7
 Source files: node_modules/@bendyline/squisq-video/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq-video
@@ -6168,7 +6168,7 @@ Copyright and complete license texts for the listed dependencies are included
 in their respective npm distributions and source repositories.
 
 ==============================================================================
-Components: @bendyline/squisq-video@2.3.4
+Components: @bendyline/squisq-video@2.3.7
 Source files: node_modules/@bendyline/squisq-video/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq-video
@@ -6180,7 +6180,7 @@ repository license, the pinned upstream copy is vendored and identified below.
 COMPONENTS
 
 ==============================================================================
-Components: @bendyline/squisq@2.11.1
+Components: @bendyline/squisq@2.11.4
 Source files: node_modules/@bendyline/squisq/NOTICE.md
 ==============================================================================
 # Third-Party Notices for @bendyline/squisq
@@ -6211,7 +6211,7 @@ third-party license texts for bundled code and data are shipped in
 THIRD_PARTY_LICENSES.txt.
 
 ==============================================================================
-Components: @bendyline/squisq@2.11.1
+Components: @bendyline/squisq@2.11.4
 Source files: node_modules/@bendyline/squisq/THIRD_PARTY_LICENSES.txt
 ==============================================================================
 THIRD-PARTY LICENSES FOR @bendyline/squisq

package/dist/index.js

@@ -1797,6 +1797,40 @@ async function importOutsideInDocument(source, options = {}) {
   if (!layout) throw new Error(`Outside-in editing does not support "${source.targetPath}".`);
   return { ...imported, layout };
 }
+function isOutsideInDataFormat(format) {
+  return format === "csv" || format === "xlsx";
+}
+async function importOutsideInDataSidecar(source) {
+  const layout = resolveOutsideInLayout(source.targetPath);
+  if (!layout || !isOutsideInDataFormat(layout.format)) {
+    throw new Error(`Outside-in data import does not support "${source.targetPath}".`);
+  }
+  const data = source.data instanceof ArrayBuffer ? source.data : source.data.buffer.slice(
+    source.data.byteOffset,
+    source.data.byteOffset + source.data.byteLength
+  );
+  const sourceName = source.targetPath.replace(/\\/g, "/").split("/").pop() ?? `data.${layout.format}`;
+  const container = layout.format === "csv" ? await import("@bendyline/squisq-formats/csv").then(
+    ({ csvToContainer }) => csvToContainer(data, { sourceName, sidecar: "always" })
+  ) : await import("@bendyline/squisq-formats/xlsx").then(
+    ({ xlsxToContainer }) => xlsxToContainer(data, {
+      sourceName,
+      sidecar: "always",
+      sheetHeadings: false
+    })
+  );
+  const importedMarkdown = await container.readDocument();
+  if (importedMarkdown === null) {
+    throw new Error(
+      `The ${layout.format.toUpperCase()} importer did not create a Markdown companion.`
+    );
+  }
+  return {
+    layout,
+    markdown: await withOutsideInMetadata(importedMarkdown, layout),
+    container
+  };
+}
 async function renderOutsideInDocument(source, options = {}) {
   const { renderOutsideInDocument: renderDocument } = await loadOutsideInModule();
   return renderDocument(source, options);
@@ -1816,6 +1850,9 @@ var IMAGE_MIME_TYPES = {
 };
 var SQUISQ_RUNTIME_DIRECTORY = "_squisq";
 var SQUISQ_RUNTIME_FILENAME = "squisq-player.js";
+function defaultOutsideInLayoutMode(outsideIn) {
+  return outsideIn && isOutsideInDataFormat(outsideIn.format) ? "block" : void 0;
+}
 function withoutLeadingSlash(path) {
   return parseWorkspacePath3(path);
 }
@@ -4472,10 +4509,9 @@ async function importOutsideInFile(file, provider) {
   const created = [claim.path];
   try {
     const sourceBytes = await file.arrayBuffer();
-    const imported = await importOutsideInDocument({
-      data: sourceBytes,
-      targetPath: claim.path
-    });
+    const layout = resolveOutsideInLayout(claim.path);
+    if (!layout) throw new Error(`Outside-in editing does not support \u201C${claim.path}\u201D.`);
+    const imported = await (isOutsideInDataFormat(layout.format) ? importOutsideInDataSidecar({ data: sourceBytes, targetPath: claim.path }) : importOutsideInDocument({ data: sourceBytes, targetPath: claim.path }));
     for (const entry of await imported.container.listFiles()) {
       if (/\.md$/i.test(entry.path)) continue;
       const data = await imported.container.readFile(entry.path);
@@ -6082,6 +6118,10 @@ function DocBlocksShell({
   const [selectedOutsideIn, setSelectedOutsideIn] = useState15(null);
   const [selectedOutsideInEditingEnabled, setSelectedOutsideInEditingEnabled] = useState15(false);
   const [selectedImage, setSelectedImage] = useState15(void 0);
+  const editorViewPreferences = useMemo3(() => {
+    const layoutMode = defaultOutsideInLayoutMode(selectedOutsideIn);
+    return layoutMode && viewPreferences.layoutMode === void 0 ? { ...viewPreferences, layoutMode } : viewPreferences;
+  }, [selectedOutsideIn, viewPreferences]);
   const adoptSelectedDocument = useCallback15((document2) => {
     setSelectedFile(document2?.displayPath ?? null);
     setSelectedSourceFile(document2?.sourcePath ?? null);
@@ -8963,7 +9003,7 @@ function DocBlocksShell({
                           initialView,
                           defaultViewportPreset: defaultPreviewViewportPreset,
                           articleId: selectedFile,
-                          fileName: selectedFile,
+                          fileName: selectedSourceFile ?? selectedFile,
                           imageSrc: selectedImageUrl,
                           imageAlt: basenameOf(selectedFile),
                           saveCoverImageOutput: saveRenderedImageOutput,
@@ -8990,7 +9030,7 @@ function DocBlocksShell({
                           documentLinkProvider,
                           workspaceContainer: versionsContainer ?? void 0,
                           allowVersioning: selectedImage === void 0 && effectiveVersioning,
-                          viewPreferences,
+                          viewPreferences: editorViewPreferences,
                           onViewPreferencesChange: handleViewPreferencesChange,
                           versionBasename: versionBasename ?? stripExtension(basenameOf(selectedFile)),
                           versioningPrunePolicy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bendyline/docblocks-react",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "React components for DocBlocks — file explorer, workspace picker, and editor shell",
   "license": "MIT",
   "author": "Bendyline",
@@ -85,14 +85,14 @@
     }
   },
   "dependencies": {
-    "@bendyline/docblocks": "2.6.0",
-    "@bendyline/squisq": "2.11.1",
+    "@bendyline/docblocks": "2.6.2",
+    "@bendyline/squisq": "2.11.4",
     "@bendyline/squisq-calc": "2.11.0",
-    "@bendyline/squisq-editor-react": "2.11.1",
-    "@bendyline/squisq-formats": "2.6.1",
-    "@bendyline/squisq-react": "2.11.1",
-    "@bendyline/squisq-video": "2.3.4",
-    "@bendyline/squisq-video-react": "2.4.5",
+    "@bendyline/squisq-editor-react": "2.11.4",
+    "@bendyline/squisq-formats": "2.6.4",
+    "@bendyline/squisq-react": "2.11.4",
+    "@bendyline/squisq-video": "2.3.7",
+    "@bendyline/squisq-video-react": "2.4.8",
     "qrcode": "1.5.4"
   },
   "devDependencies": {

package/src/styles/docblocks.css

@@ -1670,19 +1670,30 @@ body.db-resizing-sidebar * {
    caption buttons; see packages/desktop/renderer/titlebar.css. */
 .db-shell--desktop-toolbar-wrapped:not(.db-shell--mobile) {
   --db-toolbar-wrapped-row: 44px;
+  /* Squisq's toolbar keeps this inline-end padding so the second row's last
+     control never touches the pane edge. The tab row is a flex item, so a
+     100% basis would stop at the content box and leave a toolbar-coloured
+     strip beyond the tabs; it has to cover the padding too. */
+  --db-toolbar-wrapped-inline-end: 12px;
 }
 
 .db-shell--desktop-toolbar-wrapped:not(.db-shell--mobile) .squisq-toolbar {
   min-height: calc(var(--db-toolbar-wrapped-row) * 2);
   flex-wrap: wrap;
   align-content: stretch;
+  padding-right: var(--db-toolbar-wrapped-inline-end);
 }
 
+/* The tab row spans the whole toolbar, padding included, so its surface runs
+   edge to edge and its right-hand divider (which separated it from the
+   formatting controls when they shared a row) has nothing left to divide. */
 .db-shell--desktop-toolbar-wrapped:not(.db-shell--mobile) .squisq-toolbar-view-tabs {
   box-sizing: border-box;
-  flex: 0 0 100%;
-  width: 100%;
+  flex: 0 0 auto;
+  width: calc(100% + var(--db-toolbar-wrapped-inline-end));
+  margin-right: calc(-1 * var(--db-toolbar-wrapped-inline-end));
   height: var(--db-toolbar-wrapped-row);
+  border-right: 0;
 }
 
 .db-mobile-back {