Skip to content

Commit fc67633

Browse files
authored
Merge pull request #211 from UW-Macrostrat/react-color-update
Updated react-color dependency
2 parents 5fa9a13 + ecead8b commit fc67633

File tree

13 files changed

+253
-17
lines changed

13 files changed

+253
-17
lines changed

.yarn/sdks/prettier/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prettier",
3-
"version": "3.6.1-sdk",
3+
"version": "3.7.4-sdk",
44
"main": "./index.cjs",
55
"type": "commonjs",
66
"bin": "./bin/prettier.cjs"

.yarn/sdks/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.8.3-sdk",
3+
"version": "5.9.3-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs",
66
"bin": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"publish:storybook": "./scripts/publish-storybook.sh",
1919
"format": "prettier --write .",
2020
"check-types": "tsc --noEmit",
21-
"check-circular": "madge --exclude __archive --circular --extensions ts,tsx ."
21+
"check-circular": "madge --exclude __archive --exclude .yarn --circular --extensions ts,tsx ."
2222
},
2323
"author": "Daven Quinn",
2424
"license": "ISC",

packages/column-components/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
44
is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
55
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.0.3] - 2026-01-28
8+
9+
Update handling of `@uiw/react-color` dependency
10+
711
## [2.0.2] - 2026-01-28
812

913
Add rollup interop to fix CommonJS dependency linking issues

packages/column-components/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@macrostrat/column-components",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "React rendering primitives for stratigraphic columns",
55
"keywords": [
66
"geology",
@@ -53,7 +53,7 @@
5353
"@macrostrat/stratigraphy-utils": "workspace:^",
5454
"@macrostrat/timescale": "workspace:^",
5555
"@macrostrat/ui-components": "workspace:^",
56-
"@uiw/react-color-swatch": "^2.9.2",
56+
"@uiw/react-color": "^2.9.2",
5757
"chroma-js": "^3.2.0",
5858
"classnames": "^2.5.1",
5959
"d3-axis": "^3.0.0",

packages/column-components/src/editor/facies/color-picker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from "react";
22
import h from "@macrostrat/hyper";
3-
import Swatch from "@uiw/react-color-swatch";
3+
import { Swatch } from "@uiw/react-color";
44
import { Popover } from "@blueprintjs/core";
55
import { FaciesContext } from "../../context";
66

packages/data-sheet/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format
44
is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
55
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [3.0.1] - 2026-01-28
8+
9+
Update handling of `@uiw/react-color` dependency
10+
711
## [3.0.0] - 2026-01-26
812

913
- Update bundling process to `@macrostrat/web-components-bundler`

packages/data-sheet/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@macrostrat/data-sheet",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"description": "Scalable data sheet with optional editing capabilities",
55
"repository": {
66
"type": "git",
@@ -49,7 +49,7 @@
4949
"@macrostrat/ui-components": "workspace:^",
5050
"@supabase/postgrest-js": "^1.17.7",
5151
"@types/underscore": "^1.13.0",
52-
"@uiw/react-color-sketch": "^2.9.2",
52+
"@uiw/react-color": "^2.9.2",
5353
"chroma-js": "^3.2.0",
5454
"classnames": "^2.5.1",
5555
"immutability-helper": "^3.1.1",

packages/data-sheet/src/components/colors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from "@macrostrat/color-utils";
99
import { useEffect, useMemo, useRef, useState } from "react";
1010
import { memoize } from "underscore";
11-
import Sketch from "@uiw/react-color-sketch";
11+
import { Sketch } from "@uiw/react-color";
1212
import classNames from "classnames";
1313

1414
const h = hyper.styled(styles);

packages/ui-components/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [5.0.3] - 2026-01-28
4+
5+
Update handling of `@uiw/react-color` dependency
6+
37
## [5.0.2] - 2026-01-28
48

59
More fixes for CommonJS dependency linking

0 commit comments

Comments
 (0)