Skip to content

Commit 723e1b2

Browse files
committed
Centralize ui-box dependency
1 parent 2448b40 commit 723e1b2

File tree

14 files changed

+21
-20
lines changed

14 files changed

+21
-20
lines changed

packages/column-components/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"@macrostrat/stratigraphy-utils": "workspace:^",
5959
"@macrostrat/timescale": "workspace:^",
6060
"@macrostrat/ui-components": "workspace:^",
61-
"chroma-js": "^3.2.0",
6261
"classnames": "^2.5.1",
6362
"d3-axis": "^3.0.0",
6463
"d3-format": "^3.1.2",
@@ -71,9 +70,11 @@
7170
"react-scroll": "^1.7.16",
7271
"react-select": "^3.0.8",
7372
"react-svg-textures": "^1.4.7",
74-
"ui-box": "^5.4.1",
7573
"uuid": "^7.0.3"
7674
},
75+
"rollupInternal": [
76+
"labella"
77+
],
7778
"devDependencies": {
7879
"@macrostrat/web-components-bundler": "workspace:*"
7980
},

packages/column-components/src/edit-overlay.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ColumnDivision,
1616
} from "./context";
1717
import chroma from "chroma-js";
18-
import Box from "ui-box";
18+
import { Box } from "@macrostrat/ui-components";
1919

2020
const fmt = format(".1f");
2121
const fmt2 = format(".2f");

packages/column-components/src/util/column-box.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import h from "@macrostrat/hyper";
22
import { useContext } from "react";
33
import { ColumnContext } from "../context";
44
import classNames from "classnames";
5-
import { default as Box } from "ui-box";
5+
import { Box } from "@macrostrat/ui-components";
66
import { path } from "d3-path";
77
import type { Path } from "d3-path";
88

packages/column-components/src/util/scroll-box.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useCallback, useEffect, useRef } from "react";
2-
import Box from "ui-box";
2+
import { Box } from "@macrostrat/ui-components";
33
import h from "@macrostrat/hyper";
44
import { useColumn } from "../context";
55

packages/column-creator/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"@macrostrat/hyper": "^3.0.6",
5555
"@macrostrat/ui-components": "workspace:^",
5656
"immutability-helper": "^3.1.1",
57-
"ui-box": "^5.4.1",
5857
"zustand": "^5.0.3",
5958
"zustand-computed": "^2.0.2"
6059
},

packages/column-creator/src/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ColumnCreatorData, ColumnCreatorProvider, useSelector } from "./store";
22
import { ColorCell, ColorPicker, DataSheet } from "@macrostrat/data-sheet";
33

44
export * from "./store";
5-
import { FlexRow, ToasterContext } from "@macrostrat/ui-components";
5+
import { FlexRow, ToasterContext, Box } from "@macrostrat/ui-components";
66
import {
77
BasicUnitComponent,
88
Column,
@@ -14,7 +14,6 @@ import { Radio, RadioGroup, SegmentedControl } from "@blueprintjs/core";
1414
import { useState } from "react";
1515

1616
import styles from "./index.module.sass";
17-
import Box from "ui-box";
1817

1918
const h = hyper.styled(styles);
2019

packages/form-components/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
"@types/react-dom": "^18",
6363
"axios": "^1.13.2",
6464
"classnames": "^2.5.1",
65-
"mapbox-gl": "^2.15.0||^3.0.0",
66-
"ui-box": "^5.4.1"
65+
"mapbox-gl": "^2.15.0||^3.0.0"
6766
},
6867
"devDependencies": {
6968
"@macrostrat/web-components-bundler": "workspace:*"

packages/form-components/src/actions/action-preflight.stories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { Meta, StoryFn, StoryObj } from "@storybook/react-vite";
22
import h from "@macrostrat/hyper";
33
import { ActionDef, ActionsPreflightPanel } from ".";
4-
import Box from "ui-box";
54
import { FormGroup, NumericInput, Spinner } from "@blueprintjs/core";
65
import {
76
NullableSlider,
87
ToasterContext,
98
useToaster,
9+
Box
1010
} from "@macrostrat/ui-components";
1111
import {
1212
BaseDataTypeSelect,

packages/form-components/src/item-select/examples.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* NOT exported.
33
*/
44
import h from "@macrostrat/hyper";
5-
import Box from "ui-box";
5+
import { Box } from "@macrostrat/ui-components";
66
import { MenuItem } from "@blueprintjs/core";
77
import { ItemSelect } from ".";
88

packages/form-components/src/item-select/item-select.stories.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { Meta, StoryFn } from "@storybook/react-vite";
22
import h from "@macrostrat/hyper";
3-
import Box from "ui-box";
4-
import { ToasterContext } from "@macrostrat/ui-components";
3+
import { Box, ToasterContext } from "@macrostrat/ui-components";
54
import { useState } from "react";
65
import { ItemSelect } from ".";
76
import {

0 commit comments

Comments
 (0)