Cleanup after rebase

iTwin · Dec 20, 2024 · 12c3105 · 12c3105
1 parent 5fdebac
commit 12c3105
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/ui/components-react/src/components-react/newEditors/interop/EditorInterop.ts b/ui/components-react/src/components-react/newEditors/interop/EditorInterop.ts
@@ -90,10 +90,9 @@ export namespace EditorInterop {
           value: {
             rawValue: primitiveValue.value as number,
             displayValue:
-              primitiveValue.displayValue !== undefined &&
-              primitiveValue.displayValue !== ""
-                ? `${parseFloat(primitiveValue.displayValue)}`
-                : `${(primitiveValue.value as number) ?? ""}`,
+              primitiveValue.value !== undefined
+                ? `${primitiveValue.value as number}`
+                : primitiveValue.displayValue ?? "",
           } satisfies NumericValue,
         };
       case "enum":

diff --git a/ui/imodel-components-react/src/imodel-components-react.ts b/ui/imodel-components-react/src/imodel-components-react.ts
@@ -58,7 +58,7 @@ export {
 export {
   QuantityEditor,
   QuantityEditorSpec,
-} from "./imodel-components-react/inputs/QuantityEditor.js";
+} from "./imodel-components-react/inputs/newEditors/QuantityEditor.js";
 
 export {
   LineWeightSwatch,

diff --git a/...omponents-react/inputs/QuantityEditor.tsx → ...eact/inputs/newEditors/QuantityEditor.tsx b/...omponents-react/inputs/QuantityEditor.tsx → ...eact/inputs/newEditors/QuantityEditor.tsx
@@ -7,8 +7,12 @@ import { type QuantityTypeArg } from "@itwin/core-frontend";
 import { useQuantityInfo } from "./UseQuantityInfo.js";
 import type { EditorProps, EditorSpec } from "@itwin/components-react";
 import { useNumericEditorProps } from "@itwin/components-react";
-import { QuantityFormattedInput } from "./QuantityFormattedInput.js";
+import { QuantityInput } from "./QuantityInput.js";
 
+/**
+ * Editor specification for quantity values based on `IModelApp.quantityFormatter`.
+ * @beta
+ */
 export const QuantityEditorSpec: EditorSpec = {
   applies: (metadata) =>
     metadata.type === "number" &&
@@ -17,10 +21,7 @@ export const QuantityEditorSpec: EditorSpec = {
   Editor: QuantityEditor,
 };
 
-/**
- *
- */
-export function QuantityEditor(props: EditorProps) {
+function QuantityEditor(props: EditorProps) {
   const { onChange, value, onFinish, size } = useNumericEditorProps(props);
   const quantityType =
     "quantityType" in props.metadata
@@ -32,7 +33,7 @@ export function QuantityEditor(props: EditorProps) {
   });
 
   return (
-    <QuantityFormattedInput
+    <QuantityInput
       value={value}
       onChange={onChange}
       onBlur={onFinish}

diff --git a/...Editors/editors/numeric/QuantityInput.tsx → ...react/inputs/newEditors/QuantityInput.tsx b/...Editors/editors/numeric/QuantityInput.tsx → ...react/inputs/newEditors/QuantityInput.tsx
@@ -3,7 +3,7 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from "react";
-import { FormattedNumericInput } from "./FormattedNumericInput.js";
+import { FormattedNumericInput } from "@itwin/components-react";
 import type { FormatterSpec, ParserSpec } from "@itwin/core-quantity";
 
 type FormattedNumericInputProps = React.ComponentPropsWithoutRef<

diff --git a/...omponents-react/inputs/UseQuantityInfo.ts → ...eact/inputs/newEditors/UseQuantityInfo.ts b/...omponents-react/inputs/UseQuantityInfo.ts → ...eact/inputs/newEditors/UseQuantityInfo.ts
@@ -12,7 +12,8 @@ interface UseQuantityInfoProps {
 }
 
 /**
- *
+ * Hook that finds the formatter and parser in `IModelApp.quantityFormatter` for a given quantity type.
+ * @internal
  */
 export function useQuantityInfo({ type }: UseQuantityInfoProps) {
   const [{ formatter, parser }, setState] = React.useState<{
@@ -24,11 +25,7 @@ export function useQuantityInfo({ type }: UseQuantityInfoProps) {
   }));
 
   React.useEffect(() => {
-    const defaultFormatterSpec =
-      type !== undefined
-        ? IModelApp.quantityFormatter.findFormatterSpecByQuantityType(type)
-        : undefined;
-    if (defaultFormatterSpec === undefined) {
+    if (type === undefined) {
       setState({
         formatter: undefined,
         parser: undefined,