Remove @itwin/core-geometry from @itwin/components-react (backport …

…#1147) (#1149) * Remove `@itwin/core-geometry` from `@itwin/components-react` (#1147) * Add missing peer deps * change * Remove from only types from it are used. * Inline clamp * change (cherry picked from commit 687abfc) # Conflicts: # common/config/rush/pnpm-lock.yaml * rush update --------- Co-authored-by: Saulius Skliutas <[email protected]> Co-authored-by: GerardasB <[email protected]>
iTwin · Dec 11, 2024 · 330b528 · 330b528
1 parent cb78850
commit 330b528
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/common/changes/@itwin/components-react/add-missing-peer_2024-12-09-19-16.json b/common/changes/@itwin/components-react/add-missing-peer_2024-12-09-19-16.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/components-react",
+      "comment": "Remove `@itwin/core-geometry` usage from `@itwin/components-react`",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/components-react"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/ui/components-react/package.json b/ui/components-react/package.json
@@ -66,7 +66,6 @@
     "@itwin/build-tools": "4.10.0-dev.31",
     "@itwin/core-bentley": "^4.0.0",
     "@itwin/core-common": "^4.0.0",
-    "@itwin/core-geometry": "^4.0.0",
     "@itwin/core-i18n": "^4.0.0",
     "@itwin/core-react": "workspace:*",
     "@itwin/eslint-plugin": "^4.1.1",

diff --git a/...t/src/components-react/propertygrid/component/ColumnResizingPropertyListPropsSupplier.tsx b/...t/src/components-react/propertygrid/component/ColumnResizingPropertyListPropsSupplier.tsx
@@ -3,7 +3,6 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from "react";
-import { Geometry } from "@itwin/core-geometry";
 import type { PropertyListProps } from "./PropertyList.js";
 import { Orientation } from "../../common/Orientation.js";
 
@@ -79,7 +78,7 @@ export class ColumnResizingPropertyListPropsSupplier extends React.Component<
     };
 
   private _onColumnRatioChanged = (ratio: number) => {
-    ratio = Geometry.clamp(ratio, this._minRatio, this._maxRatio);
+    ratio = clamp(ratio, this._minRatio, this._maxRatio);
     if (this.state.columnRatio === ratio) return { ratio };
 
     this.setState({ columnRatio: ratio });
@@ -140,11 +139,7 @@ export class ColumnResizingPropertyListPropsSupplier extends React.Component<
   }
 
   private getValidColumnRatio(): number {
-    return Geometry.clamp(
-      this.state.columnRatio,
-      this._minRatio,
-      this._maxRatio
-    );
+    return clamp(this.state.columnRatio, this._minRatio, this._maxRatio);
   }
 
   public override render() {
@@ -167,3 +162,7 @@ export class ColumnResizingPropertyListPropsSupplier extends React.Component<
     return this.props.children(listProps);
   }
 }
+
+function clamp(value: number, min: number, max: number) {
+  return Math.max(min, Math.min(max, value));
+}