From 25ff532a5adbab604056bd6416abe106a1f35c5b Mon Sep 17 00:00:00 2001 From: Elliott Marquez <5981958+e111077@users.noreply.github.com> Date: Fri, 30 Jun 2023 14:40:02 -0700 Subject: [PATCH] chore: update material color utilities to 0.2.7 --- catalog/package.json | 2 +- catalog/src/utils/material-color-helpers.ts | 10 +--------- package-lock.json | 10 +++++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/catalog/package.json b/catalog/package.json index fc35d38c5..96e2dd4ca 100644 --- a/catalog/package.json +++ b/catalog/package.json @@ -159,7 +159,7 @@ "dependencies": { "@11ty/is-land": "^3.0.0", "@lit-labs/ssr-client": "^1.1.1", - "@material/material-color-utilities": "^0.2.5", + "@material/material-color-utilities": "^0.2.7", "@material/mwc-drawer": "^0.27.0", "@material/web": "^1.0.0-pre.6", "@preact/signals-core": "^1.3.0", diff --git a/catalog/src/utils/material-color-helpers.ts b/catalog/src/utils/material-color-helpers.ts index dc9b83628..324d8805f 100644 --- a/catalog/src/utils/material-color-helpers.ts +++ b/catalog/src/utils/material-color-helpers.ts @@ -10,11 +10,6 @@ import type {Theme} from '../types/color-events.js'; import {applyThemeString} from './apply-theme-string.js'; -interface WithTint { - surfaceTint: typeof MaterialDynamicColors.background; - surfaceTintColor: typeof MaterialDynamicColors.background; -} - /** * A Mapping of color token name to MCU HCT color function generator. */ @@ -38,15 +33,12 @@ const materialColors = { 'outline-variant': MaterialDynamicColors.outlineVariant, shadow: MaterialDynamicColors.shadow, scrim: MaterialDynamicColors.scrim, - // TODO(b/288481318): clean up once MCU 0.2.7 is published on NPM. - 'surface-tint': (MaterialDynamicColors as unknown as WithTint).surfaceTint || - (MaterialDynamicColors as unknown as WithTint).surfaceTintColor, + 'surface-tint': MaterialDynamicColors.surfaceTint, primary: MaterialDynamicColors.primary, 'on-primary': MaterialDynamicColors.onPrimary, 'primary-container': MaterialDynamicColors.primaryContainer, 'on-primary-container': MaterialDynamicColors.onPrimaryContainer, 'inverse-primary': MaterialDynamicColors.inversePrimary, - 'inverse-on-primary': MaterialDynamicColors.inverseOnPrimary, secondary: MaterialDynamicColors.secondary, 'on-secondary': MaterialDynamicColors.onSecondary, 'secondary-container': MaterialDynamicColors.secondaryContainer, diff --git a/package-lock.json b/package-lock.json index 8ba504625..acbba30e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@material/web", - "version": "1.0.0-pre.11", + "version": "1.0.0-pre.12", "license": "Apache-2.0", "workspaces": [ ".", @@ -36,7 +36,7 @@ "dependencies": { "@11ty/is-land": "^3.0.0", "@lit-labs/ssr-client": "^1.1.1", - "@material/material-color-utilities": "^0.2.5", + "@material/material-color-utilities": "^0.2.7", "@material/mwc-drawer": "^0.27.0", "@material/web": "^1.0.0-pre.6", "@preact/signals-core": "^1.3.0", @@ -914,9 +914,9 @@ } }, "node_modules/@material/material-color-utilities": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.6.tgz", - "integrity": "sha512-pMdkH7PvuJQS1q9igiPFfrS04Zu1feDXOVV69uWe2kr+RcK+7v3OylIYMwJDIwip1pFdGyTY4KkMy6vPIA/uSw==" + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@material/material-color-utilities/-/material-color-utilities-0.2.7.tgz", + "integrity": "sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==" }, "node_modules/@material/menu": { "version": "14.0.0-canary.53b3cad2f.0",