Merge pull request #38 from oxidecomputer/p3-color-test

New approach to wide gamut colour

.figmaexportrc.js

@@ -45,11 +45,6 @@ module.exports = {
                 basename = `carat-${basename.split('=')[1].toLowerCase()}-12`
               }
 
-              // Update distro icon names to match what's in figma
-              if (dirname === 'distro') {
-                return `distro-${basename}.svg`
-              }
-
               // Add the icon's size category as a postfix, if present
               if (!isNaN(parseInt(dirname))) {
                 return `${basename}-${dirname}.svg`

components/dist/index.d.ts

@@ -30,8 +30,8 @@ declare const Badge: ({ className, children, color, variant, }: BadgeProps) => r
 
 declare const buttonSizes: readonly ["sm", "icon", "base"];
 declare const variants: readonly ["primary", "secondary", "ghost", "danger"];
-type ButtonSize = (typeof buttonSizes)[number];
-type Variant = (typeof variants)[number];
+type ButtonSize = typeof buttonSizes[number];
+type Variant = typeof variants[number];
 type ButtonStyleProps = {
     size?: ButtonSize;
     variant?: Variant;
@@ -45,8 +45,8 @@ declare const Button: react.ForwardRefExoticComponent<Omit<ButtonProps, "ref"> &
 
 declare const spinnerSizes: readonly ["base", "lg"];
 declare const spinnerVariants: readonly ["primary", "secondary", "ghost", "danger"];
-type SpinnerSize = (typeof spinnerSizes)[number];
-type SpinnerVariant = (typeof spinnerVariants)[number];
+type SpinnerSize = typeof spinnerSizes[number];
+type SpinnerVariant = typeof spinnerVariants[number];
 interface SpinnerProps {
     className?: string;
     size?: SpinnerSize;

components/dist/index.js

@@ -58782,7 +58782,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var Admonition = ({ node }) => {
   const attrs = node.getAttributes();
   const content = (0, import_react_asciidoc.useGetContent)(node);
-  const contentModel = node.content_model;
+  const contentModel = node.getContentModel();
   let icon;
   if (attrs.name === "caution") {
     icon = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Error12, {});

components/src/AsciiDoc/Admonition.tsx

@@ -17,8 +17,7 @@ const Admonition = ({ node }: { node: AdocTypes.Block }) => {
 
   // Undocumented asciidoc attribute
   // Use this to check if we should render the content as is, or use a <Content /> block
-  // @ts-ignore
-  const contentModel = node.content_model
+  const contentModel = node.getContentModel()
 
   let icon
   if (attrs.name === 'caution') {

components/src/ui/badge/Badge.tsx

@@ -56,7 +56,7 @@ export const Badge = ({
         `variant-${variant}`,
         'inline-flex h-4 items-center whitespace-nowrap rounded-sm px-[3px] py-[1px] uppercase text-mono-sm',
         badgeColors[variant][color],
-        className
+        className,
       )}
     >
       <span>{children}</span>

components/src/ui/button/Button.tsx

@@ -15,8 +15,8 @@ import { Spinner } from '../'
 export const buttonSizes = ['sm', 'icon', 'base'] as const
 export const variants = ['primary', 'secondary', 'ghost', 'danger'] as const
 
-export type ButtonSize = (typeof buttonSizes)[number]
-export type Variant = (typeof variants)[number]
+export type ButtonSize = typeof buttonSizes[number]
+export type Variant = typeof variants[number]
 
 const sizeStyle: Record<ButtonSize, string> = {
   sm: 'h-8 px-3 text-mono-sm svg:w-4',
@@ -40,7 +40,7 @@ export const buttonStyle = ({
     sizeStyle[size],
     variant === 'danger'
       ? 'focus:outline-destructive-secondary'
-      : 'focus:outline-accent-secondary'
+      : 'focus:outline-accent-secondary',
   )
 }
 
@@ -79,7 +79,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
       // props by the parent
       ...rest
     },
-    ref
+    ref,
   ) => {
     const isDisabled = disabled || loading
     return (
@@ -100,5 +100,5 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
         </span>
       </button>
     )
-  }
+  },
 )

components/src/ui/spinner/Spinner.tsx

@@ -12,8 +12,8 @@ import { useEffect, useRef, useState } from 'react'
 
 export const spinnerSizes = ['base', 'lg'] as const
 export const spinnerVariants = ['primary', 'secondary', 'ghost', 'danger'] as const
-export type SpinnerSize = (typeof spinnerSizes)[number]
-export type SpinnerVariant = (typeof spinnerVariants)[number]
+export type SpinnerSize = typeof spinnerSizes[number]
+export type SpinnerVariant = typeof spinnerVariants[number]
 
 interface SpinnerProps {
   className?: string

icons/index.ts

@@ -62,7 +62,7 @@ export type Icon =
 | { name: 'folder', size: 24 }
 | { name: 'gateway', size: 16 }
 | { name: 'gateway', size: 24 }
-| { name: 'health', size: 16 }
+| { name: 'heart', size: 16 }
 | { name: 'heart', size: 24 }
 | { name: 'hide', size: 12 }
 | { name: 'hide', size: 16 }