@redvars/peacock 3.5.0 → 3.6.0

package/src/canvas/canvas.ts

@@ -0,0 +1,391 @@
+import { html, LitElement, svg, nothing } from 'lit';
+import { property } from 'lit/decorators.js';
+import { classMap } from 'lit/directives/class-map.js';
+import IndividualComponent from '@/IndividualComponent.js';
+import styles from './canvas.scss';
+
+export type CanvasDirection = 'up' | 'down' | 'left' | 'right';
+
+export type CanvasStrokeVariant = 'solid' | 'dashed' | 'animated-dashed';
+
+export interface CanvasPoint {
+  x: number;
+  y: number;
+}
+
+export interface CanvasPathSegment {
+  direction: CanvasDirection;
+  length: number;
+}
+
+interface BaseCanvasShape {
+  color?: string;
+}
+
+interface BaseCanvasStrokeShape extends BaseCanvasShape {
+  variant?: CanvasStrokeVariant;
+  showArrow?: boolean;
+  clickable?: boolean;
+}
+
+export interface CanvasCircleShape extends BaseCanvasShape {
+  type: 'circle';
+  x?: number;
+  y?: number;
+  radius?: number;
+}
+
+export interface CanvasRectShape extends BaseCanvasShape {
+  type: 'rect';
+  x?: number;
+  y?: number;
+  width?: number;
+  height?: number;
+}
+
+export interface CanvasLineShape extends BaseCanvasStrokeShape {
+  type: 'line';
+  start?: CanvasPoint;
+  end?: CanvasPoint;
+}
+
+export interface CanvasConnectorShape extends BaseCanvasStrokeShape {
+  type: 'connector';
+  start?: CanvasPoint;
+  path?: CanvasPathSegment[];
+}
+
+export type CanvasShape =
+  | CanvasCircleShape
+  | CanvasRectShape
+  | CanvasLineShape
+  | CanvasConnectorShape;
+
+interface CanvasBounds {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * @label Canvas
+ * @tag wc-canvas
+ * @rawTag canvas
+ * @summary A Material 3 inspired SVG canvas for drawing shapes, lines, and connectors on a dotted grid.
+ *
+ * @cssprop --canvas-background - Background color for the canvas wrapper. Defaults to surface-container-low.
+ * @cssprop --canvas-dot-color - Color of the background grid dots. Defaults to outline-variant.
+ * @cssprop --canvas-line-color - Default stroke color for lines and connectors. Defaults to on-surface.
+ * @cssprop --canvas-hover-color - Stroke color on hover for clickable shapes. Defaults to primary.
+ * @cssprop --canvas-arrow-color - Stroke color for arrow markers. Defaults to on-surface.
+ *
+ * @example
+ * ```html
+ * <wc-canvas id="my-canvas"></wc-canvas>
+ * <script>
+ *   document.querySelector('#my-canvas').shapes = [
+ *     { type: 'circle', x: 0, y: 0, radius: 0.25, color: 'red' },
+ *   ];
+ * </script>
+ * ```
+ */
+@IndividualComponent
+export class Canvas extends LitElement {
+  static styles = [styles];
+
+  /**
+   * Array of shape objects to render on the canvas.
+   */
+  @property({ type: Array })
+  shapes: CanvasShape[] = [];
+
+  /**
+   * Padding around the computed viewbox (in grid units).
+   */
+  @property({ type: Number, reflect: true })
+  padding: number = 1;
+
+  /**
+   * Zoom multiplier for the canvas dimensions.
+   */
+  @property({ type: Number, reflect: true })
+  zoom: number = 1;
+
+  /**
+   * Optional viewbox override string (e.g. "0 0 100 100").
+   */
+  @property({ type: String })
+  viewbox?: string;
+
+  private unitSize: number = 1;
+
+  private gap: number = this.unitSize * 10;
+
+  private static getNextPoint(
+    point: CanvasPoint,
+    direction: CanvasDirection,
+    length: number,
+  ): CanvasPoint {
+    if (direction === 'down') return { x: point.x, y: point.y + length };
+    if (direction === 'up') return { x: point.x, y: point.y - length };
+    if (direction === 'left') return { x: point.x - length, y: point.y };
+    if (direction === 'right') return { x: point.x + length, y: point.y };
+    return { x: point.x, y: point.y };
+  }
+
+  private static updateComputationArea(
+    point: CanvasPoint,
+    area: CanvasBounds,
+  ): CanvasBounds {
+    const nextArea = { ...area };
+    if (point.x > nextArea.width) nextArea.width = point.x;
+    else if (point.x < nextArea.x) nextArea.x = point.x;
+    if (point.y > nextArea.height) nextArea.height = point.y;
+    else if (point.y < nextArea.y) nextArea.y = point.y;
+    return nextArea;
+  }
+
+  private static getStrokeVariantClasses(variant?: CanvasStrokeVariant) {
+    return {
+      line: true,
+      'no-color': false,
+      'variant-dashed': variant === 'dashed' || variant === 'animated-dashed',
+      'variant-animated-dashed': variant === 'animated-dashed',
+    };
+  }
+
+  private computeShapes(initialBounds: CanvasBounds) {
+    const dotRadius = this.unitSize;
+    let computedViewbox = { ...initialBounds };
+
+    const shapes = this.shapes.map(shape => {
+      switch (shape.type) {
+        case 'circle': {
+          const r = shape.radius || 1;
+          const cx = shape.x || 0;
+          const cy = shape.y || 0;
+          if (cx + Math.ceil(r) > computedViewbox.width)
+            computedViewbox.width = cx + Math.ceil(r);
+          if (cx - Math.ceil(r) < computedViewbox.x)
+            computedViewbox.x = cx - Math.ceil(r);
+          if (cy + Math.ceil(r) > computedViewbox.height)
+            computedViewbox.height = cy + Math.ceil(r);
+          if (cy - Math.ceil(r) < computedViewbox.y)
+            computedViewbox.y = cy - Math.ceil(r);
+
+          return svg`<circle
+            cx=${cx * this.gap + dotRadius}
+            cy=${cy * this.gap + dotRadius}
+            r=${r * this.gap}
+            fill=${shape.color || 'var(--canvas-line-color, var(--color-on-surface))'}
+          />`;
+        }
+        case 'rect': {
+          const w = shape.width || 1;
+          const h = shape.height || 1;
+          const rx = shape.x || 0;
+          const ry = shape.y || 0;
+          if (rx + Math.ceil(w) > computedViewbox.width)
+            computedViewbox.width = rx + Math.ceil(w);
+          if (rx - Math.ceil(w) < computedViewbox.x)
+            computedViewbox.x = rx - Math.ceil(w);
+          if (ry + Math.ceil(h) > computedViewbox.height)
+            computedViewbox.height = ry + Math.ceil(h);
+          if (ry - Math.ceil(h) < computedViewbox.y)
+            computedViewbox.y = ry - Math.ceil(h);
+
+          return svg`<rect
+            x=${rx * this.gap + dotRadius}
+            y=${ry * this.gap}
+            width=${w * this.gap + dotRadius}
+            height=${h * this.gap + dotRadius}
+            fill=${shape.color || 'var(--canvas-line-color, var(--color-on-surface))'}
+          />`;
+        }
+        case 'line': {
+          const start = shape.start || { x: 0, y: 0 };
+          const end = shape.end || { x: 0, y: 0 };
+          const pathString = `M${start.x * this.gap + dotRadius} ${start.y * this.gap + dotRadius} L${end.x * this.gap + dotRadius} ${end.y * this.gap + dotRadius}`;
+          const strokeColor =
+            shape.color ||
+            'var(--canvas-line-color, var(--color-on-surface))';
+
+          return svg`<path
+            class=${classMap({
+              ...Canvas.getStrokeVariantClasses(shape.variant),
+              clickable: !!shape.clickable,
+              'no-color': !shape.color,
+            })}
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke=${strokeColor}
+            marker-end=${shape.showArrow ? 'url(#endarrow)' : ''}
+            d=${pathString}
+            stroke-dasharray=${shape.variant === 'dashed' || shape.variant === 'animated-dashed' ? '6,6' : nothing}
+            fill="none"
+          />`;
+        }
+        case 'connector': {
+          const start = shape.start || { x: 0, y: 0 };
+          let pathString = `M${start.x * this.gap + dotRadius} ${start.y * this.gap + dotRadius}`;
+          let current = { ...start };
+          computedViewbox = Canvas.updateComputationArea(current, computedViewbox);
+
+          const pathSegments = shape.path || [];
+          for (let i = 0; i < pathSegments.length; i += 1) {
+            const path = pathSegments[i];
+
+            if (i === 0) {
+              const point = Canvas.getNextPoint(current, path.direction, 1);
+              pathString += ` L${point.x * this.gap + dotRadius} ${point.y * this.gap + dotRadius}`;
+              current = { ...point };
+              computedViewbox = Canvas.updateComputationArea(current, computedViewbox);
+            }
+
+            const point = Canvas.getNextPoint(
+              current,
+              path.direction,
+              path.length - 2,
+            );
+            pathString += ` L${point.x * this.gap + dotRadius} ${point.y * this.gap + dotRadius}`;
+            current = { ...point };
+            computedViewbox = Canvas.updateComputationArea(current, computedViewbox);
+
+            if (i === pathSegments.length - 1) {
+              const endPoint = Canvas.getNextPoint(current, path.direction, 1);
+              pathString += ` L${endPoint.x * this.gap + dotRadius} ${endPoint.y * this.gap + dotRadius}`;
+              current = { ...endPoint };
+              computedViewbox = Canvas.updateComputationArea(current, computedViewbox);
+            } else {
+              const nextPath = pathSegments[i + 1];
+              const midPoint = Canvas.getNextPoint(current, path.direction, 1);
+              const nextPoint = Canvas.getNextPoint(
+                midPoint,
+                nextPath.direction,
+                1,
+              );
+              pathString += ` Q ${midPoint.x * this.gap + dotRadius} ${midPoint.y * this.gap + dotRadius} ${nextPoint.x * this.gap + dotRadius} ${nextPoint.y * this.gap + dotRadius}`;
+              current = { ...nextPoint };
+              computedViewbox = Canvas.updateComputationArea(current, computedViewbox);
+            }
+          }
+
+          const strokeColor =
+            shape.color ||
+            'var(--canvas-line-color, var(--color-on-surface))';
+
+          return svg`<g class=${classMap({ clickable: !!shape.clickable })}>
+            <path
+              class=${classMap({
+                ...Canvas.getStrokeVariantClasses(shape.variant),
+                'no-color': !shape.color,
+              })}
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke=${strokeColor}
+              marker-end=${shape.showArrow ? 'url(#endarrow)' : ''}
+              d=${pathString}
+              stroke-dasharray=${shape.variant === 'dashed' || shape.variant === 'animated-dashed' ? '6,6' : nothing}
+              fill="none"
+            />
+            <path
+              stroke-width="10"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke="transparent"
+              d=${pathString}
+              fill="none"
+            />
+          </g>`;
+        }
+        default:
+          return nothing;
+      }
+    });
+
+    // Padding
+    computedViewbox.x -= this.padding;
+    computedViewbox.y -= this.padding;
+    computedViewbox.width += this.padding;
+    computedViewbox.height += this.padding;
+    computedViewbox.width -= computedViewbox.x;
+    computedViewbox.height -= computedViewbox.y;
+
+    return { shapes, computedViewbox };
+  }
+
+  protected render() {
+    const dotRadius = this.unitSize;
+    let computedViewBox = { width: 0, height: 0, x: 0, y: 0 };
+
+    const { shapes, computedViewbox } = this.computeShapes(computedViewBox);
+    computedViewBox = computedViewbox;
+
+    if (this.viewbox) {
+      const viewBox = this.viewbox.split(' ');
+      computedViewBox = {
+        x: parseInt(viewBox[0], 10),
+        y: parseInt(viewBox[1], 10),
+        width: parseInt(viewBox[2], 10),
+        height: parseInt(viewBox[3], 10),
+      };
+    }
+
+    const wrapperWidth =
+      (computedViewBox.width * this.gap + 2) * dotRadius * this.zoom;
+    const wrapperHeight =
+      (computedViewBox.height * this.gap + 2) * dotRadius * this.zoom;
+
+    const svgViewBox = `${computedViewBox.x * this.gap} ${computedViewBox.y * this.gap} ${computedViewBox.width * this.gap + 2 * dotRadius} ${computedViewBox.height * this.gap + 2 * dotRadius}`;
+
+    return html`
+      <div
+        class="canvas-wrapper"
+        style="width: ${wrapperWidth}px; height: ${wrapperHeight}px;"
+      >
+        <svg
+          class="canvas"
+          height="100%"
+          width="100%"
+          viewBox=${svgViewBox}
+        >
+          <defs>
+            <pattern
+              id="canvas-background"
+              patternUnits="userSpaceOnUse"
+              width=${this.gap}
+              height=${this.gap}
+            >
+              <circle cx="1" cy="1" r=${dotRadius} />
+            </pattern>
+
+            <marker
+              id="endarrow"
+              markerWidth="15"
+              markerHeight="22.5"
+              refX="9"
+              refY="15"
+              markerUnits="userSpaceOnUse"
+              orient="auto"
+            >
+              <polyline points="0 22.5, 7.5 15, 0 7.5"></polyline>
+            </marker>
+          </defs>
+
+          <rect
+            x=${computedViewBox.x * this.gap}
+            y=${computedViewBox.y * this.gap}
+            width="100%"
+            height="100%"
+            fill="url(#canvas-background)"
+          />
+
+          ${shapes}
+        </svg>
+      </div>
+    `;
+  }
+}

package/src/canvas/index.ts

@@ -0,0 +1,2 @@
+export { Canvas } from './canvas.js';
+export type { CanvasShape } from './canvas.js';

package/src/card/card.ts

@@ -1,4 +1,4 @@
-import { LitElement, html, nothing, PropertyValues } from 'lit';
+import { LitElement, html, nothing } from 'lit';
 import { property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { dispatchActivationClick, isActivationClick } from '../__utils/dispatch-event-utils.js';
@@ -7,6 +7,7 @@ import { throttle } from '@/__utils/throttle.js';
 import IndividualComponent from '@/IndividualComponent.js';
 import styles from './card.scss';
 import colorStyles from './card-colors.scss';
+import BaseHyperlinkMixin from '@/__mixins/BaseHyperlinkMixin.js';
 
 type CardVariant = 'elevated' | 'filled' | 'outlined';
 
@@ -28,7 +29,7 @@ type CardVariant = 'elevated' | 'filled' | 'outlined';
  * ```
  */
 @IndividualComponent
-export class Card extends LitElement {
+export class Card extends BaseHyperlinkMixin(LitElement) {
   static styles = [styles, colorStyles];
 
   #id = crypto.randomUUID();
@@ -48,17 +49,6 @@ export class Card extends LitElement {
   @property({ attribute: 'disabled-reason' })
   disabledReason: string = '';
 
-  /**
-   * Hyperlink to navigate to on click.
-   */
-  @property({ reflect: true }) href?: string;
-
-  /**
-   * Sets or retrieves the window or frame at which to target content.
-   */
-  @property() target: string = '_self';
-
-
   /**
    * Sets the delay for throttle in milliseconds. Defaults to 200 milliseconds.
    */
@@ -76,12 +66,8 @@ export class Card extends LitElement {
 
   @query('.card') readonly cardElement!: HTMLElement | null;
 
-  @query('slot') readonly contentSlot!: HTMLSlotElement | null;
-
   #tabindex?: number = 0;
 
-  #slottedTabIndexMap = new WeakMap<HTMLElement, string | null>();
-
   override firstUpdated() {
     this.__dispatchClickWithThrottle = throttle(
       this.__dispatchClick,
@@ -91,52 +77,9 @@ export class Card extends LitElement {
       this.renderRoot.querySelector('slot'),
       hasContent => {
         this.slotHasContent = hasContent;
-        this.__syncSlottedChildrenTabIndex();
         this.requestUpdate();
       },
     );
-    this.__syncSlottedChildrenTabIndex();
-  }
-
-  override updated(changedProperties: PropertyValues<this>) {
-    if (changedProperties.has('actionable') || changedProperties.has('href')) {
-      this.__syncSlottedChildrenTabIndex();
-    }
-  }
-
-  __syncSlottedChildrenTabIndex() {
-    if (!this.contentSlot) return;
-
-    const shouldDisableTabbing = this.actionable || this.__isLink();
-    const assignedChildren = this.contentSlot.assignedElements({ flatten: true });
-
-    assignedChildren.forEach(node => {
-      if (!(node instanceof HTMLElement)) return;
-
-      if (shouldDisableTabbing) {
-        if (!this.#slottedTabIndexMap.has(node)) {
-          this.#slottedTabIndexMap.set(node, node.getAttribute('tabindex'));
-        }
-
-        if (node.getAttribute('tabindex') !== '-1') {
-          node.setAttribute('tabindex', '-1');
-        }
-        return;
-      }
-
-      const originalTabIndex = this.#slottedTabIndexMap.get(node);
-      if (originalTabIndex === null) {
-        if (node.hasAttribute('tabindex')) {
-          node.removeAttribute('tabindex');
-        }
-      } else if (originalTabIndex !== undefined) {
-        if (node.getAttribute('tabindex') !== originalTabIndex) {
-          node.setAttribute('tabindex', originalTabIndex);
-        }
-      }
-
-      this.#slottedTabIndexMap.delete(node);
-    });
   }
 
   __dispatchClickWithThrottle: (event: MouseEvent | KeyboardEvent) => void =
@@ -162,10 +105,6 @@ export class Card extends LitElement {
     dispatchActivationClick(this.cardElement);
   };
 
-  __isLink() {
-    return !!this.href;
-  }
-
   __getDisabledReasonID() {
     return this.disabled && this.disabledReason
       ? `disabled-reason-${this.#id}`
@@ -207,6 +146,7 @@ export class Card extends LitElement {
   render() {
 
     const isLink = this.__isLink();
+    const disableSlotTabbing = this.actionable || isLink;
 
     const cssClasses = {
       card: true,
@@ -223,7 +163,7 @@ export class Card extends LitElement {
               class=${classMap(cssClasses)}
               id="card"
               >
-              ${this.renderCardContent()}
+              ${this.renderCardContent(disableSlotTabbing)}
             </div>`;
     }
 
@@ -240,7 +180,7 @@ export class Card extends LitElement {
               aria-disabled=${`${this.disabled}`}
               ?disabled=${this.disabled}
             >
-              ${this.renderCardContent()}
+              ${this.renderCardContent(disableSlotTabbing)}
             </button>`;
     }
     return html`<a
@@ -257,13 +197,13 @@ export class Card extends LitElement {
             ?aria-describedby=${this.__getDisabledReasonID()}
             aria-disabled=${`${this.disabled}`}
           >
-            ${this.renderCardContent()}
+            ${this.renderCardContent(disableSlotTabbing)}
           </a>`;
   }
 
-  renderCardContent() {
+  renderCardContent(disableSlotTabbing: boolean) {
     return html`
-    <wc-focus-ring class="focus-ring" .control=${this} .forElement=${this.cardElement}></wc-focus-ring>
+      <wc-focus-ring class="focus-ring" for='card'></wc-focus-ring>
       <wc-elevation class="elevation"></wc-elevation>
       <div class="background"></div>
       <div class="outline"></div>
@@ -271,8 +211,8 @@ export class Card extends LitElement {
 
       <div class="card-content">
 
-        <div class="slot-container">
-          <slot @slotchange=${this.__syncSlottedChildrenTabIndex}></slot>
+        <div class="slot-container" ?inert=${disableSlotTabbing}>
+          <slot></slot>
         </div>
 
       </div>

package/src/chart-bar/chart-bar.ts

@@ -1,8 +1,8 @@
 import { html, LitElement, PropertyValues } from 'lit';
 import { property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
+import { select, max, scaleBand, scaleLinear, scaleOrdinal, axisLeft, axisBottom, ScaleOrdinal } from 'd3';
 import IndividualComponent from '@/IndividualComponent.js';
-import * as d3 from 'd3';
 import styles from './chart-bar.scss';
 
 export type ChartBarItem = {
@@ -94,8 +94,7 @@ export class ChartBar extends LitElement {
   }
 
   private _getPaletteScale() {
-    return d3
-      .scaleOrdinal<string, string>()
+    return scaleOrdinal<string, string>()
       .domain(this.data.map(d => d.name))
       .range(chartColors);
   }
@@ -103,7 +102,7 @@ export class ChartBar extends LitElement {
   private _resolveColor(
     name: string,
     override: string | undefined,
-    scale: d3.ScaleOrdinal<string, string>,
+    scale: ScaleOrdinal<string, string>,
   ) {
     return override || scale(name);
   }
@@ -116,7 +115,7 @@ export class ChartBar extends LitElement {
     const margin = Math.max(this.margin, 12);
     const data = this.data ?? [];
 
-    const svg = d3.select(this.svgElement);
+    const svg = select(this.svgElement);
     svg.attr('width', width).attr('height', height);
 
     const innerWidth = Math.max(width - margin * 2, 0);
@@ -134,15 +133,13 @@ export class ChartBar extends LitElement {
       return;
     }
 
-    const xScale = d3
-      .scaleBand<string>()
+    const xScale = scaleBand<string>()
       .domain(data.map(d => d.name))
       .range([0, innerWidth])
       .padding(0.28);
 
-    const maxValue = d3.max(data, d => d.value) ?? 0;
-    const yScale = d3
-      .scaleLinear()
+    const maxValue = max(data, d => d.value) ?? 0;
+    const yScale = scaleLinear()
       .domain([0, maxValue || 1])
       .nice()
       .range([innerHeight, 0]);
@@ -150,8 +147,7 @@ export class ChartBar extends LitElement {
     const yGrid = container.select<SVGGElement>('.y-grid');
     yGrid
       .call(
-        d3
-          .axisLeft(yScale)
+        axisLeft(yScale)
           .ticks(5)
           .tickSize(-innerWidth)
           .tickFormat(() => ''),
@@ -165,8 +161,7 @@ export class ChartBar extends LitElement {
     xAxis
       .attr('transform', `translate(0,${innerHeight})`)
       .call(
-        d3
-          .axisBottom(xScale)
+        axisBottom(xScale)
           .tickSizeOuter(0)
           .tickFormat(name => {
             const entry = data.find(d => d.name === name);