Updated react-color dependency

davenquinn · davenquinn · commit aa27a32542a8 · 2026-01-28T23:44:35.000-06:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,3 +1,6 @@
 {
-  "recommendations": ["arcanis.vscode-zipfs", "esbenp.prettier-vscode"]
+  "recommendations": [
+    "arcanis.vscode-zipfs",
+    "esbenp.prettier-vscode"
+  ]
 }
diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { existsSync } = require(`fs`);
-const { createRequire, register } = require(`module`);
-const { resolve } = require(`path`);
-const { pathToFileURL } = require(`url`);
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
@@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
 }
 
 const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? (exports) => absRequire(absUserWrapperPath)(exports)
-  : (exports) => exports;
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
 
 // Defer to the real prettier/bin/prettier.cjs your application uses
 module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
diff --git a/.yarn/sdks/prettier/index.cjs b/.yarn/sdks/prettier/index.cjs
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { existsSync } = require(`fs`);
-const { createRequire, register } = require(`module`);
-const { resolve } = require(`path`);
-const { pathToFileURL } = require(`url`);
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
 
 const relPnpApiPath = "../../../.pnp.cjs";
 
@@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
 }
 
 const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? (exports) => absRequire(absUserWrapperPath)(exports)
-  : (exports) => exports;
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
 
 // Defer to the real prettier your application uses
 module.exports = wrapWithUserWrapper(absRequire(`prettier`));
diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.6.1-sdk",
+  "version": "3.7.4-sdk",
   "main": "./index.cjs",
   "type": "commonjs",
   "bin": "./bin/prettier.cjs"
diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { existsSync } = require(`fs`);
-const { createRequire, register } = require(`module`);
-const { resolve } = require(`path`);
-const { pathToFileURL } = require(`url`);
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
@@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
 }
 
 const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? (exports) => absRequire(absUserWrapperPath)(exports)
-  : (exports) => exports;
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
 
 // Defer to the real typescript/bin/tsc your application uses
 module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const { existsSync } = require(`fs`);
-const { createRequire, register } = require(`module`);
-const { resolve } = require(`path`);
-const { pathToFileURL } = require(`url`);
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
@@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
 }
 
 const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? (exports) => absRequire(absUserWrapperPath)(exports)
-  : (exports) => exports;
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
 
 // Defer to the real typescript/bin/tsserver your application uses
 module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.8.3-sdk",
+  "version": "5.9.3-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "publish:storybook": "./scripts/publish-storybook.sh",
     "format": "prettier --write .",
     "check-types": "tsc --noEmit",
-    "check-circular": "madge --exclude __archive --circular --extensions ts,tsx ."
+    "check-circular": "madge --exclude __archive --exclude .yarn --circular --extensions ts,tsx ."
   },
   "author": "Daven Quinn",
   "license": "ISC",
diff --git a/packages/column-components/CHANGELOG.md b/packages/column-components/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.3] - 2026-01-28
+
+Update handling of `@uiw/react-color` dependency
+
 ## [2.0.2] - 2026-01-28
 
 Add rollup interop to fix CommonJS dependency linking issues
diff --git a/packages/column-components/package.json b/packages/column-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-components",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "React rendering primitives for stratigraphic columns",
   "keywords": [
     "geology",
@@ -53,7 +53,7 @@
     "@macrostrat/stratigraphy-utils": "workspace:^",
     "@macrostrat/timescale": "workspace:^",
     "@macrostrat/ui-components": "workspace:^",
-    "@uiw/react-color-swatch": "^2.9.2",
+    "@uiw/react-color": "^2.9.2",
     "chroma-js": "^3.2.0",
     "classnames": "^2.5.1",
     "d3-axis": "^3.0.0",
diff --git a/packages/column-components/src/editor/facies/color-picker.ts b/packages/column-components/src/editor/facies/color-picker.ts
@@ -1,6 +1,6 @@
 import { Component } from "react";
 import h from "@macrostrat/hyper";
-import Swatch from "@uiw/react-color-swatch";
+import { Swatch } from "@uiw/react-color";
 import { Popover } from "@blueprintjs/core";
 import { FaciesContext } from "../../context";
 
diff --git a/packages/data-sheet/CHANGELOG.md b/packages/data-sheet/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.1] - 2026-01-28
+
+Update handling of `@uiw/react-color` dependency
+
 ## [3.0.0] - 2026-01-26
 
 - Update bundling process to `@macrostrat/web-components-bundler`
diff --git a/packages/data-sheet/package.json b/packages/data-sheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/data-sheet",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Scalable data sheet with optional editing capabilities",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "@macrostrat/ui-components": "workspace:^",
     "@supabase/postgrest-js": "^1.17.7",
     "@types/underscore": "^1.13.0",
-    "@uiw/react-color-sketch": "^2.9.2",
+    "@uiw/react-color": "^2.9.2",
     "chroma-js": "^3.2.0",
     "classnames": "^2.5.1",
     "immutability-helper": "^3.1.1",
diff --git a/packages/data-sheet/src/components/colors.ts b/packages/data-sheet/src/components/colors.ts
@@ -8,7 +8,7 @@ import {
 } from "@macrostrat/color-utils";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { memoize } from "underscore";
-import Sketch from "@uiw/react-color-sketch";
+import { Sketch } from "@uiw/react-color";
 import classNames from "classnames";
 
 const h = hyper.styled(styles);
diff --git a/packages/ui-components/CHANGELOG.md b/packages/ui-components/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [5.0.3] - 2026-01-28
+
+Update handling of `@uiw/react-color` dependency
+
 ## [5.0.2] - 2026-01-28
 
 More fixes for CommonJS dependency linking
diff --git a/packages/ui-components/package.json b/packages/ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/ui-components",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "UI components for React and Blueprint.js",
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "@macrostrat/hyper": "^3.0.6",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18",
-    "@uiw/react-color-sketch": "^2.9.2",
+    "@uiw/react-color": "^2.9.2",
     "axios": "^1.13.2",
     "chroma-js": "^3.2.0",
     "classnames": "^2.5.1",
diff --git a/packages/ui-components/src/form-controls/color-editor.ts b/packages/ui-components/src/form-controls/color-editor.ts
@@ -1,6 +1,6 @@
 import h from "@macrostrat/hyper";
 import { ErrorBoundary } from "../error-boundary";
-import Sketch from "@uiw/react-color-sketch";
+import { Sketch } from "@uiw/react-color";
 import { Button, Popover } from "@blueprintjs/core";
 import { useState } from "react";
 import chroma from "chroma-js";
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "recommendations": ["arcanis.vscode-zipfs", "esbenp.prettier-vscode"]`
	`2`	`+ "recommendations": [`
	`3`	`+ "arcanis.vscode-zipfs",`
	`4`	`+ "esbenp.prettier-vscode"`
	`5`	`+ ]`
`3`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "prettier",`
`3`		`- "version": "3.6.1-sdk",`
	`3`	`+ "version": "3.7.4-sdk",`
`4`	`4`	`"main": "./index.cjs",`
`5`	`5`	`"type": "commonjs",`
`6`	`6`	`"bin": "./bin/prettier.cjs"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "typescript",`
`3`		`- "version": "5.8.3-sdk",`
	`3`	`+ "version": "5.9.3-sdk",`
`4`	`4`	`"main": "./lib/typescript.js",`
`5`	`5`	`"type": "commonjs",`
`6`	`6`	`"bin": {`