@datalayer/primer-addons 1.0.19 → 1.0.20

package/lib/components/logo/DatalayerTextAI.d.ts

@@ -1,9 +1,9 @@
-import { type SVGProps } from 'react';
-import { type ThemeVariant } from '../../theme';
-export interface DatalayerTextAIProps extends Omit<SVGProps<SVGSVGElement>, 'ref'> {
+import { type SVGProps } from "react";
+import { type ThemeVariant } from "../../theme";
+export interface DatalayerTextAIProps extends Omit<SVGProps<SVGSVGElement>, "ref"> {
     size?: number;
     scale?: number;
-    colorMode?: 'light' | 'dark' | 'auto';
+    colorMode?: "light" | "dark" | "auto";
     variant?: ThemeVariant;
     /** Colour for the "LAYER" part of the wordmark. */
     primaryColor?: string;

package/lib/components/logo/DatalayerTextAI.js

@@ -3,10 +3,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Copyright (c) 2023-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { forwardRef } from 'react';
-import { AI } from './AI';
-import { DatalayerText } from './DatalayerText';
-import { getLogoColors } from './DatalayerLogo';
+import { forwardRef } from "react";
+import { DatalayerText } from "./DatalayerText";
+import { getLogoColors } from "./DatalayerLogo";
 const TEXT_LEFT_TRIM = 12;
 const TEXT_END_X = 136.672 - TEXT_LEFT_TRIM;
 const AI_SIZE = 24;
@@ -15,13 +14,14 @@ const AI_VISIBLE_LEFT = 0.25;
 const AI_VISIBLE_HEIGHT = 16.136075;
 const AI_SCALE_TO_TEXT_HEIGHT = 25 / AI_VISIBLE_HEIGHT;
 const AI_RENDER_SIZE = AI_SIZE * AI_SCALE_TO_TEXT_HEIGHT;
+const AI_RENDER_SCALE = AI_RENDER_SIZE / AI_SIZE;
 const AI_X_TRIM = AI_VISIBLE_LEFT * AI_SCALE_TO_TEXT_HEIGHT;
 const AI_Y_TRIM = AI_VISIBLE_TOP * AI_SCALE_TO_TEXT_HEIGHT;
 /**
  * Datalayer wordmark followed by AI glyph on one line.
  * Both elements are aligned to the same 25-unit cap height.
  */
-export const DatalayerTextAI = forwardRef(function DatalayerTextAI({ size = 25, scale = 1, colorMode = 'light', variant = 'datalayer', primaryColor, secondaryColor, textColor, 
+export const DatalayerTextAI = forwardRef(function DatalayerTextAI({ size = 25, scale = 1, colorMode = "light", variant = "datalayer", primaryColor, secondaryColor, textColor, 
 // 2.380655 ~= 25 / (0.7 * 15.00187)
 textSizeMultiplier = 2.380655, aiPrimaryColor, aiSecondaryColor, aiGap = 6, ...svgProps }, ref) {
     const themed = getLogoColors(variant, colorMode);
@@ -35,6 +35,6 @@ textSizeMultiplier = 2.380655, aiPrimaryColor, aiSecondaryColor, aiGap = 6, ...s
     const baseWidth = (viewBoxWidth / 25) * size;
     const height = baseHeight * scale;
     const width = baseWidth * scale;
-    return (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `0 0 ${viewBoxWidth} 25`, width: width, height: height, role: "img", "aria-label": "Datalayer AI", ref: ref, ...svgProps, children: [_jsx(DatalayerText, { primaryColor: layerColor, secondaryColor: dataTextColor, sizeMultiplier: textSizeMultiplier, x: -TEXT_LEFT_TRIM }), _jsx(AI, { size: AI_RENDER_SIZE, x: TEXT_END_X + aiGap - AI_X_TRIM, y: -AI_Y_TRIM, variant: variant, colorMode: colorMode, primaryColor: resolvedAiPrimary, secondaryColor: resolvedAiSecondary })] }));
+    return (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: `0 0 ${viewBoxWidth} 25`, width: width, height: height, role: "img", "aria-label": "Datalayer AI", ref: ref, ...svgProps, children: [_jsx(DatalayerText, { primaryColor: layerColor, secondaryColor: dataTextColor, sizeMultiplier: textSizeMultiplier, x: -TEXT_LEFT_TRIM }), _jsxs("g", { transform: `translate(${TEXT_END_X + aiGap - AI_X_TRIM} ${-AI_Y_TRIM}) scale(${AI_RENDER_SCALE})`, children: [_jsx("path", { d: "m13.788825 3.932 6.43325 16.136075h3.5279L17.316725 3.932H13.788825Z", fill: resolvedAiPrimary, strokeWidth: 0.25 }), _jsx("path", { d: "m6.325375 13.682775 2.20125 -5.67065 2.201275 5.67065H6.325375ZM6.68225 3.932 0.25 20.068075h3.596525l1.3155 -3.3886h6.729425l1.315275 3.3886h3.59655L10.371 3.932H6.68225Z", fill: resolvedAiSecondary, fillRule: "evenodd", clipRule: "evenodd", strokeWidth: 0.25 })] })] }));
 });
 export default DatalayerTextAI;

package/lib/components/logo/index.d.ts

@@ -1,7 +1,5 @@
-export * from './AI';
-export * from './AI2';
-export * from './DI';
-export * from './DatalayerLogo';
-export * from './DatalayerLogoText';
-export * from './DatalayerText';
-export * from './DatalayerTextAI';
+export * from "./DI";
+export * from "./DatalayerLogo";
+export * from "./DatalayerLogoText";
+export * from "./DatalayerText";
+export * from "./DatalayerTextAI";

package/lib/components/logo/index.js

@@ -1,7 +1,5 @@
-export * from './AI';
-export * from './AI2';
-export * from './DI';
-export * from './DatalayerLogo';
-export * from './DatalayerLogoText';
-export * from './DatalayerText';
-export * from './DatalayerTextAI';
+export * from "./DI";
+export * from "./DatalayerLogo";
+export * from "./DatalayerLogoText";
+export * from "./DatalayerText";
+export * from "./DatalayerTextAI";

package/lib/components/toolbar/Toolbar.js

@@ -30,7 +30,24 @@ export function Toolbar({ items, extraItems, className, disabled, ariaLabel = 'E
     const allItems = useMemo(() => {
         if (!extraItems?.length)
             return items;
-        return [...items, ...extraItems];
+        /*
+         * An extra item takes the place of the item it shares its key with.
+         *
+         * A host that knows better what one of the items should do — how this
+         * document is saved, where it is run — says so with the key of that item
+         * rather than adding a second button next to it. What it leaves out, its
+         * order and its icon among them, stays as the toolbar had it.
+         */
+        const overrides = new Map(extraItems.map(item => [item.key, item]));
+        const merged = items.map(item => {
+            const override = overrides.get(item.key);
+            if (!override) {
+                return item;
+            }
+            overrides.delete(item.key);
+            return { ...item, ...override };
+        });
+        return [...merged, ...extraItems.filter(item => overrides.has(item.key))];
     }, [items, extraItems]);
     return (_jsx(Box, { className: className, role: "toolbar", "aria-label": ariaLabel, sx: {
             display: 'flex',

package/lib/components/toolbar/ToolbarButton.js

@@ -6,16 +6,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * ToolbarButton - A single button in a Toolbar.
  *
- * Renders a native <button> with a direct Octicon icon.
- * Avoids Primer's IconButton and Tooltip components to prevent invariant
- * violations in Primer v37 (Tooltip requires a native interactive child,
- * and IconButton's internal Tooltip conflicts with external wrappers).
- *
- * Uses the native HTML `title` attribute for tooltip behaviour.
+ * Renders a native <button> with a direct Octicon icon, wrapped in Primer's
+ * Tooltip when the item carries a title. The v37 Tooltip demands a native
+ * interactive child — the reason IconButton is avoided — and a plain
+ * <button> is exactly that. A disabled item therefore wears `aria-disabled`
+ * rather than the `disabled` attribute: a truly disabled button is not
+ * interactive, which both silences its tooltip and breaks the invariant —
+ * and the tooltip of a disabled action is precisely where the why-disabled
+ * explanation lives.
  *
  * @module components/toolbar/ToolbarButton
  */
 import { isValidElement } from 'react';
+import { Tooltip } from '@primer/react';
 export function ToolbarButton({ item, size = 'medium' }) {
     const { ariaLabel, title, icon, label, isActive, onClick, disabled } = item;
     // Resolve icon → React element.
@@ -38,7 +41,7 @@ export function ToolbarButton({ item, size = 'medium' }) {
         iconElement = _jsx("span", { style: { fontSize: 12, fontWeight: 600, lineHeight: 1 }, children: label });
     }
     const btnSize = size === 'small' ? 28 : 32;
-    return (_jsx("button", { type: "button", "aria-label": ariaLabel, title: title, onMouseDown: (e) => e.preventDefault(), onClick: onClick, disabled: disabled, style: {
+    const button = (_jsx("button", { type: "button", "aria-label": ariaLabel, "aria-disabled": disabled || undefined, onMouseDown: (e) => e.preventDefault(), onClick: disabled ? undefined : onClick, style: {
             display: 'inline-flex',
             alignItems: 'center',
             justifyContent: 'center',
@@ -66,5 +69,7 @@ export function ToolbarButton({ item, size = 'medium' }) {
                 ? 'var(--fgColor-accent, #0969da)'
                 : 'var(--fgColor-muted, #656d76)';
         }, children: iconElement }));
+    // No title: nothing to say, no wrapper to say it with.
+    return title ? (_jsx(Tooltip, { text: title, direction: "s", children: button })) : (button);
 }
 export default ToolbarButton;

package/lib/components/toolbar/ToolbarRenderer.js

@@ -11,6 +11,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
  * @module components/toolbar/ToolbarRenderer
  */
 import { Fragment } from 'react';
+import { Box } from '../box/Box';
 import { ToolbarButton } from './ToolbarButton';
 import { ToolbarDropdown } from './ToolbarDropdown';
 import { ToolbarDivider } from './ToolbarDivider';
@@ -30,6 +31,8 @@ export function ToolbarRenderer({ items, disabled, size = 'medium' }) {
                     return (_jsx(Fragment, { children: _jsx(ToolbarDropdown, { item: { ...item, disabled: itemDisabled }, size: size }) }, item.key));
                 case 'divider':
                     return (_jsx(Fragment, { children: _jsx(ToolbarDivider, {}) }, item.key));
+                case 'spacer':
+                    return (_jsx(Box, { sx: { flex: '1 1 auto', minWidth: 8 } }, item.key));
                 case 'custom':
                     return _jsx(Fragment, { children: item.render() }, item.key);
                 default:

package/lib/components/toolbar/types.d.ts

@@ -3,7 +3,7 @@ import type { IconProps } from '@primer/octicons-react';
 /**
  * Toolbar item types that can be registered in a toolbar.
  */
-export type ToolbarItemType = 'button' | 'dropdown' | 'divider' | 'custom';
+export type ToolbarItemType = 'button' | 'dropdown' | 'divider' | 'spacer' | 'custom';
 /**
  * Base toolbar item definition.
  */
@@ -88,6 +88,15 @@ export interface ToolbarDropdownItem extends ToolbarItemBase {
 export interface ToolbarDividerItem extends ToolbarItemBase {
     type: 'divider';
 }
+/**
+ * Toolbar spacer item definition.
+ *
+ * Takes the free space of the toolbar, so the items ordered after it sit on
+ * the trailing edge — e.g. a status indicator kept away from the actions.
+ */
+export interface ToolbarSpacerItem extends ToolbarItemBase {
+    type: 'spacer';
+}
 /**
  * Toolbar custom item definition.
  */
@@ -99,7 +108,7 @@ export interface ToolbarCustomItem extends ToolbarItemBase {
 /**
  * Union of all toolbar item types.
  */
-export type ToolbarItem = ToolbarButtonItem | ToolbarDropdownItem | ToolbarDividerItem | ToolbarCustomItem;
+export type ToolbarItem = ToolbarButtonItem | ToolbarDropdownItem | ToolbarDividerItem | ToolbarSpacerItem | ToolbarCustomItem;
 /**
  * Props for the extensible Toolbar component.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/primer-addons",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "license": "BSD-3-Clause",
   "scripts": {
     "build": "npm run build:lib",

package/lib/components/logo/AI.d.ts

@@ -1,17 +0,0 @@
-import { type SVGProps } from 'react';
-import { type ThemeVariant } from '../../theme';
-export interface AIProps extends Omit<SVGProps<SVGSVGElement>, 'ref'> {
-    size?: number;
-    variant?: ThemeVariant;
-    colorMode?: 'light' | 'dark' | 'auto';
-    /** Colour of the "I" glyph. */
-    primaryColor?: string;
-    /** Colour of the "A" glyph. */
-    secondaryColor?: string;
-}
-/**
- * AI glyph mark from the official brand source SVG.
- * Defaults to themed logo colors and supports explicit overrides.
- */
-export declare const AI: import("react").ForwardRefExoticComponent<AIProps & import("react").RefAttributes<SVGSVGElement>>;
-export default AI;

package/lib/components/logo/AI.js

@@ -1,18 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/*
- * Copyright (c) 2023-2026 Datalayer, Inc.
- * Distributed under the terms of the Modified BSD License.
- */
-import { forwardRef } from 'react';
-import { getLogoColors } from './DatalayerLogo';
-/**
- * AI glyph mark from the official brand source SVG.
- * Defaults to themed logo colors and supports explicit overrides.
- */
-export const AI = forwardRef(function AI({ size = 24, variant = 'datalayer', colorMode = 'light', primaryColor, secondaryColor, ...svgProps }, ref) {
-    const themed = getLogoColors(variant, colorMode);
-    const resolvedPrimary = primaryColor ?? themed.primary;
-    const resolvedSecondary = secondaryColor ?? themed.textColor;
-    return (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", width: size, height: size, role: "img", "aria-label": "AI", ref: ref, ...svgProps, children: [_jsx("path", { d: "m13.788825 3.932 6.43325 16.136075h3.5279L17.316725 3.932H13.788825Z", fill: resolvedPrimary, strokeWidth: 0.25 }), _jsx("path", { d: "m6.325375 13.682775 2.20125 -5.67065 2.201275 5.67065H6.325375ZM6.68225 3.932 0.25 20.068075h3.596525l1.3155 -3.3886h6.729425l1.315275 3.3886h3.59655L10.371 3.932H6.68225Z", fill: resolvedSecondary, fillRule: "evenodd", clipRule: "evenodd", strokeWidth: 0.25 })] }));
-});
-export default AI;

package/lib/components/logo/AI2.d.ts

@@ -1,20 +0,0 @@
-import { type SVGProps } from 'react';
-import { type ThemeVariant } from '../../theme';
-export interface AI2Props extends Omit<SVGProps<SVGSVGElement>, 'ref'> {
-    size?: number;
-    variant?: ThemeVariant;
-    colorMode?: 'light' | 'dark' | 'auto';
-    /** Colour of the "I" glyph. */
-    primaryColor?: string;
-    /** Colour of the "A" glyph. */
-    secondaryColor?: string;
-}
-/**
- * Alternate AI glyph mark.
- *
- * A is rendered with an oblique left bar, a right vertical bar,
- * and a horizontal crossbar.
- * I is rendered as a simple vertical bar.
- */
-export declare const AI2: import("react").ForwardRefExoticComponent<AI2Props & import("react").RefAttributes<SVGSVGElement>>;
-export default AI2;

package/lib/components/logo/AI2.js

@@ -1,23 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/*
- * Copyright (c) 2023-2026 Datalayer, Inc.
- * Distributed under the terms of the Modified BSD License.
- */
-import { forwardRef } from 'react';
-import { getLogoColors } from './DatalayerLogo';
-/**
- * Alternate AI glyph mark.
- *
- * A is rendered with an oblique left bar, a right vertical bar,
- * and a horizontal crossbar.
- * I is rendered as a simple vertical bar.
- */
-export const AI2 = forwardRef(function AI2({ size = 24, variant = 'datalayer', colorMode = 'light', primaryColor, secondaryColor, ...svgProps }, ref) {
-    const themed = getLogoColors(variant, colorMode);
-    const resolvedPrimary = primaryColor ?? themed.primary;
-    const resolvedSecondary = secondaryColor ?? themed.textColor;
-    const barWidth = 3.1;
-    const leftBarBottomInnerX = -2.2 + barWidth;
-    return (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "-2.2 0 26.2 24", width: size, height: size, role: "img", "aria-label": "AI2", ref: ref, ...svgProps, children: [_jsx("path", { d: `M15.35 3.5h${barWidth}V20h-${barWidth}z`, fill: resolvedPrimary }), _jsx("path", { d: `M-2.2 20 9.8 3.5h${barWidth}L${leftBarBottomInnerX} 20H-2.2z`, fill: resolvedSecondary }), _jsx("path", { d: `M10.35 3.5h${barWidth}V20h-${barWidth}z`, fill: resolvedSecondary }), _jsx("path", { d: "M3.5 12.95h9.6v2.75H3.5z", fill: resolvedSecondary })] }));
-});
-export default AI2;