@oliasoft-open-source/react-ui-library 4.16.1-beta-3 → 4.17.0-beta-1

package/README.md

@@ -37,7 +37,7 @@ To quickly start a new project using the React UI Library with Vite, you can use
     ```bash
    cd my-new-project
     ```
-
+   
 3. **Install React UI Library: Add the React UI Library to your project:**
 
    ```bash
@@ -48,13 +48,13 @@ To quickly start a new project using the React UI Library with Vite, you can use
    ```bash
     yarn add @oliasoft-open-source/react-ui-library
    ```
-
+   
 4. **Modify the Sample Page:** Open the src/App.jsx file and import a component from the React UI Library to use it:
 
     ```bash
     import React from 'react';
     import { Text } from '@oliasoft-open-source/react-ui-library';
-
+    
     function App() {
       return (
         <div className="App">
@@ -62,7 +62,7 @@ To quickly start a new project using the React UI Library with Vite, you can use
         </div>
       );
     }
-
+    
     export default App;
     ```
 
@@ -358,7 +358,6 @@ The `Button` component is a versatile interface element that supports various st
 | `disabled`    | If true, disables the button.                              | `false`        |
 | `groupOrder`  | Specifies the button's position in a group (e.g., start, middle, end). | None (optional) |
 | `icon`        | An icon to be displayed on the button. Deprecated in favor of using `label`. | None (optional) |
-| `ignoreDisabledContext`        | Allows the button to be enabled even when inside `DisabledContext`. | `false` |
 | `label`       | The content of the button, which can be text or a ReactNode. | None (optional) |
 | `loading`     | Shows an activity indicator, suggesting that an action is in progress. | `false`    |
 | `name`        | The name of the button, which can be used in forms.        | None (optional) |

package/dist/index.d.ts

@@ -43,7 +43,7 @@ export declare enum BreadcrumbLinkType {
     CUSTOM = "custom"
 }
 
-export declare const Button: ({ active, basic, colored, disabled, ignoreDisabledContext, groupOrder, icon, label, loading, name, pill, round, small, styles, width, title, type, onClick, error, warning, testId, tooltip, inverted, component: Component, url, }: IButtonProps) => JSX_2.Element;
+export declare const Button: ({ active, basic, colored, disabled, groupOrder, icon, label, loading, name, pill, round, small, styles, width, title, type, onClick, error, warning, testId, tooltip, inverted, component: Component, url, }: IButtonProps) => JSX_2.Element;
 
 export declare const ButtonGroup: (props: IButtonGroupProps) => JSX_2.Element;
 
@@ -206,7 +206,6 @@ export declare interface IButtonProps {
     basic?: boolean;
     colored?: boolean | string;
     disabled?: boolean;
-    ignoreDisabledContext?: boolean;
     groupOrder?: string | null;
     icon?: ReactNode | string;
     label?: ReactNode | string | null;

package/dist/index.js

@@ -16,7 +16,7 @@ import * as PropTypes from "prop-types";
 import PropTypes__default from "prop-types";
 import ReactDOM, { createPortal, unstable_batchedUpdates, render } from "react-dom";
 import { noop as noop$2, set, get as get$2, isString as isString$3, isNumber as isNumber$1, isBoolean as isBoolean$1, isFunction as isFunction$3, isEmpty, isArray as isArray$1, toNumber, debounce as debounce$2, isObject as isObject$5, isEqual as isEqual$3 } from "lodash";
-import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, validateNumber, cleanNumStr, stripLeadingZeros, roundToFixed, roundByMagnitude, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue, withUnit, convertSamePrecision, convertAndGetValue, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
+import { toString as toString$1, isScientificStringNum, roundToPrecision, toNum, validateNumber, cleanNumStr, stripLeadingZeros, roundToFixed, roundByMagnitude, unitFromQuantity, getUnit, KNOWN_UNITS, ALT_UNITS, isValueWithUnit, getValue, withUnit, convertSamePrecision, convertAndGetValue, split as split$1, label as label$b, isValidNum, getAltUnitsListByQuantity, altUnitsList, withPrettyUnitLabel, getUnitsForQuantity, roundByMagnitudeToFixed } from "@oliasoft-open-source/units";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x2) {
   return x2 && x2.__esModule && Object.prototype.hasOwnProperty.call(x2, "default") ? x2["default"] : x2;
@@ -4078,7 +4078,6 @@ const Button$1 = ({
   basic: basic2 = false,
   colored: colored2 = false,
   disabled: disabled2 = false,
-  ignoreDisabledContext = false,
   groupOrder = null,
   icon: icon2 = null,
   label: label2 = "",
@@ -4134,7 +4133,6 @@ const Button$1 = ({
     }
     return "";
   })();
-  const isDisabled = disabled2 || disabledContext && !ignoreDisabledContext;
   return /* @__PURE__ */ jsx(ButtonTooltipWrapper, { tooltip: tooltip2, children: /* @__PURE__ */ jsxs(
     Component2,
     {
@@ -4144,7 +4142,7 @@ const Button$1 = ({
         active2 ? buttonStyles.active : "",
         basic2 ? buttonStyles.basic : "",
         color2,
-        isDisabled ? buttonStyles.disabled : "",
+        disabled2 || disabledContext ? buttonStyles.disabled : "",
         (icon2 || loading) && !label2 ? buttonStyles.iconOnly : "",
         inverted2 ? buttonStyles.inverted : "",
         order2,
@@ -4153,7 +4151,7 @@ const Button$1 = ({
         small2 ? buttonStyles.small : "",
         styles2
       ),
-      disabled: isDisabled,
+      disabled: disabled2 || disabledContext,
       name: name2 ?? "",
       onClick,
       ...title2 ? { title: title2 } : {},
@@ -6690,8 +6688,7 @@ const Dialog = ({ dialog: dialog2 }) => {
               small: true,
               colored: "muted",
               onClick: onClose,
-              testId: testId && `${testId}-dismiss`,
-              ignoreDisabledContext: true
+              testId: testId && `${testId}-dismiss`
             }
           ) }) : null
         ] }),
@@ -65775,6 +65772,10 @@ const checkConversion = ({
   if (!availableUnits.includes(toUnit)) {
     return false;
   }
+  const valueUnit = getUnit(String(value));
+  if (valueUnit && !availableUnits.includes(valueUnit)) {
+    return false;
+  }
   return true;
 };
 const convertUnit = ({
@@ -65827,6 +65828,14 @@ const safeConvertValue = ({
 }) => {
   const rawValue = getValue(value);
   const isInvalidInput = isWrongValue(rawValue);
+  const shouldConvert = checkConversion({
+    value,
+    unitkey,
+    toUnit
+  });
+  if (!shouldConvert) {
+    return { value: rawValue };
+  }
   if (isValueWithUnknownUnit(value)) {
     return { value: rawValue };
   }
@@ -66048,6 +66057,22 @@ const UnitInput = ({
   const createPredefinedOption = (el2) => {
     const elementValue = (el2 == null ? void 0 : el2.value) ? el2.value : "";
     const [value2 = "", unit2 = ""] = isValueWithUnit(elementValue) ? split$1(elementValue) : [elementValue];
+    let description2 = withPrettyUnitLabel(elementValue);
+    const shouldConvert = checkConversion({
+      value: elementValue,
+      unitkey,
+      toUnit: unit2
+    });
+    if (shouldConvert) {
+      const { value: value3 = "" } = safeConvertValue({
+        value: elementValue,
+        toUnit: preferredUnit,
+        unitkey,
+        defaultFromUnit: unit2,
+        doNotConvertValue: noConversion
+      });
+      description2 = withPrettyUnitLabel(withUnit(value3, preferredUnit));
+    }
     return {
       type: MenuType.OPTION,
       inline: true,
@@ -66069,7 +66094,7 @@ const UnitInput = ({
         /* @__PURE__ */ jsx(Text, { children: el2.label }),
         /* @__PURE__ */ jsx(Spacer, { width: "20px", height: "0" })
       ] }),
-      description: isValueWithUnit(elementValue) ? `${value2} ${unit2}` : elementValue,
+      description: description2,
       selected: foundPredefinedMenuOption === el2 && predefinedOptionsMenuState === PredefinedOptionsMenuState.PREDEFINED
     };
   };