@etsoo/react 1.5.37 → 1.5.40

package/lib/mu/OptionGroup.js

@@ -66,12 +66,13 @@ export function OptionGroup(props) {
         return (React.createElement(FormControlLabel, { key: value, control: control, value: value, label: label }));
     });
     // Group
-    const group = multiple ? (React.createElement(FormGroup, { row: row }, list)) : (React.createElement(RadioGroup, { row: row, name: name, value: defaultValue, onChange: (_event, value) => {
+    const group = multiple ? (React.createElement(FormGroup, { row: row }, list)) : (React.createElement(RadioGroup, { row: row, name: name, value: values[0], onChange: (_event, value) => {
             if (firstOptionValue == null)
                 return;
             const typeValue = Utils.parseString(value, firstOptionValue);
             if (onValueChange)
                 onValueChange(typeValue);
+            setValues([typeValue]);
         } }, list));
     // Layout
     return (React.createElement(FormControl, { component: "fieldset", ...rest },

package/lib/mu/RLink.d.ts

@@ -1,13 +1,8 @@
 /// <reference types="react" />
 import { LinkProps } from '@mui/material';
-import { LinkProps as RouterLinkProps } from 'react-router-dom';
-/**
- * Router Link props
- */
-export declare type RLinkProps = LinkProps & RouterLinkProps;
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
-export declare function RLink(props: RLinkProps): JSX.Element;
+export declare function RLink(props: LinkProps): JSX.Element;

package/lib/mu/RLink.js

@@ -1,11 +1,22 @@
 import { Link } from '@mui/material';
-import { Link as RouterLink } from 'react-router-dom';
 import React from 'react';
+import { globalApp } from '../app/ReactApp';
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
 export function RLink(props) {
-    return React.createElement(Link, { component: RouterLink, ...props });
+    // Destruct
+    const { href, onClick, ...rest } = props;
+    // Click handler
+    const onClickLocl = (event) => {
+        if (onClick)
+            onClick(event);
+        if (href && globalApp) {
+            globalApp.history.push(href);
+        }
+    };
+    // Component
+    return React.createElement(Link, { ...rest, onClick: onClickLocl });
 }

package/lib/mu/pages/CommonPage.js

@@ -18,9 +18,13 @@ export const CommonPageScrollContainer = global;
  */
 export function CommonPage(props) {
     // Destruct
-    const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, supportBack = false, targetFields, sx = { padding: paddings }, ...rest } = props;
+    const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, supportBack = false, targetFields, sx = {}, ...rest } = props;
     // Fab padding
     const fabPadding = MUGlobal.increase(MUGlobal.pagePaddings, fabPaddingAdjust);
+    if (typeof sx === 'object' && sx != null && !Reflect.has(sx, 'padding')) {
+        // Set default padding
+        Reflect.set(sx, 'padding', paddings);
+    }
     // Labels
     const labels = Labels.CommonPage;
     // Update

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.37",
+    "version": "1.5.40",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/mu/OptionGroup.tsx

@@ -194,11 +194,12 @@ export function OptionGroup<
         <RadioGroup
             row={row}
             name={name}
-            value={defaultValue}
+            value={values[0]}
             onChange={(_event, value) => {
                 if (firstOptionValue == null) return;
                 const typeValue = Utils.parseString<D>(value, firstOptionValue);
                 if (onValueChange) onValueChange(typeValue);
+                setValues([typeValue]);
             }}
         >
             {list}

package/src/mu/RLink.tsx

@@ -1,20 +1,27 @@
 import { Link, LinkProps } from '@mui/material';
-import {
-    Link as RouterLink,
-    LinkProps as RouterLinkProps
-} from 'react-router-dom';
 import React from 'react';
-
-/**
- * Router Link props
- */
-export type RLinkProps = LinkProps & RouterLinkProps;
+import { globalApp } from '../app/ReactApp';
 
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
-export function RLink(props: RLinkProps) {
-    return <Link component={RouterLink} {...props} />;
+export function RLink(props: LinkProps) {
+    // Destruct
+    const { href, onClick, ...rest } = props;
+
+    // Click handler
+    const onClickLocl = (
+        event: React.MouseEvent<HTMLAnchorElement, MouseEvent>
+    ) => {
+        if (onClick) onClick(event);
+
+        if (href && globalApp) {
+            globalApp.history.push(href);
+        }
+    };
+
+    // Component
+    return <Link {...rest} onClick={onClickLocl} />;
 }

package/src/mu/pages/CommonPage.tsx

@@ -37,7 +37,7 @@ export function CommonPage(props: CommonPageProps) {
         scrollContainer,
         supportBack = false,
         targetFields,
-        sx = { padding: paddings },
+        sx = {},
         ...rest
     } = props;
 
@@ -47,6 +47,11 @@ export function CommonPage(props: CommonPageProps) {
         fabPaddingAdjust
     );
 
+    if (typeof sx === 'object' && sx != null && !Reflect.has(sx, 'padding')) {
+        // Set default padding
+        Reflect.set(sx, 'padding', paddings);
+    }
+
     // Labels
     const labels = Labels.CommonPage;