@iobroker/adapter-react-v5 6.0.10 → 6.0.12

package/Components/ColorPicker.d.ts

@@ -36,6 +36,7 @@ interface ColorPickerProps {
     customPalette?: string[];
     noInputField?: boolean;
     barWidth?: number;
+    sx?: Record<string, any>;
 }
 interface ColorPickerState {
     displayColorPicker: boolean;
@@ -44,14 +45,8 @@ interface ColorPickerState {
 }
 declare class ColorPicker extends Component<ColorPickerProps, ColorPickerState> {
     constructor(props: ColorPickerProps);
-    /**
-     * @private
-     */
-    handleClick: (e: React.MouseEvent<HTMLDivElement>) => void;
-    /**
-     * @private
-     */
-    handleClose: () => void;
+    private handleClick;
+    private handleClose;
     /**
      * Convert the given color to hex ('#rrggbb') or rgba ('rgba(r,g,b,a)') format.
      * @returns the hex or rgba representation of the given color.
@@ -68,8 +63,6 @@ declare class ColorPicker extends Component<ColorPickerProps, ColorPickerState>
     private handleChange;
     /**
      * IF the props are updated from outside, they should override the state
-     * @param _prevProps
-     * @param prevState
      */
     componentDidUpdate(_prevProps: ColorPickerProps, prevState: ColorPickerState): void;
     renderCustomPalette(): React.JSX.Element;

package/Components/ColorPicker.js

@@ -115,18 +115,12 @@ const styles = {
 class ColorPicker extends react_1.Component {
     constructor(props) {
         super(props);
-        /**
-         * @private
-         */
         this.handleClick = (e) => {
             this.setState({
                 displayColorPicker: !this.state.displayColorPicker,
                 anchorEl: this.state.displayColorPicker ? null : e.currentTarget,
             });
         };
-        /**
-         * @private
-         */
         this.handleClose = () => {
             this.setState({ displayColorPicker: false, anchorEl: null });
         };
@@ -177,8 +171,6 @@ class ColorPicker extends react_1.Component {
     }
     /**
      * IF the props are updated from outside, they should override the state
-     * @param _prevProps
-     * @param prevState
      */
     componentDidUpdate(_prevProps, prevState) {
         const color = ColorPicker.getColor(this.props.color || this.props.value || '');
@@ -200,7 +192,7 @@ class ColorPicker extends react_1.Component {
         const style = Object.assign({}, (this.props.style || {}));
         style.position = 'relative';
         const { color } = this.state;
-        return react_1.default.createElement(material_1.Box, { component: "div", style: style, className: this.props.className || '' },
+        return react_1.default.createElement(material_1.Box, { component: "div", style: style, sx: this.props.sx || undefined, className: this.props.className || '' },
             this.props.noInputField ? null : react_1.default.createElement(material_1.TextField, { disabled: this.props.disabled, variant: "standard", id: "ar_color_picker_name", label: this.props.label || this.props.name || 'color', value: color || '', margin: "dense", sx: {
                     '&.MuiFormControl-root': styles.textDense,
                     width: color ? 'calc(100% - 80px)' : 'calc(100% - 56px)',

package/Components/ObjectBrowser.d.ts

@@ -198,6 +198,7 @@ interface ObjectBrowserEditObjectProps {
     isFloatComma: boolean;
     onNewObject: (obj: ioBroker.AnyObject) => void;
     t: Translate;
+    width: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 }
 interface ObjectAliasEditorProps {
     t: Translate;

package/Components/ObjectBrowser.js

@@ -5113,7 +5113,7 @@ class ObjectBrowserClass extends react_1.Component {
                         .catch(e => this.showError(`Cannot write object: ${e}`));
                 }
                 this.setState({ editObjectDialog: '', editObjectAlias: false });
-            } });
+            }, width: this.props.width });
     }
     renderViewObjectFileDialog() {
         if (!this.state.viewFileDialog || !this.props.objectBrowserViewFile) {

package/README.md

@@ -771,6 +771,9 @@ The best practice is to replace `padding` with `p` and `margin` with `m`, so you
 -->
 
 ## Changelog
+### 6.0.12 (2024-06-29)
+* (bluefox) Added support for the overrides in the theme
+
 ### 6.0.10 (2024-06-27)
 * (bluefox) Added translation
 * (bluefox) Mobile object browser improved

package/Theme.d.ts

@@ -2,5 +2,5 @@ import { type IobTheme, type ThemeName } from './types';
 /**
  * The theme creation factory function.
  */
-declare const CustomTheme: (type: ThemeName) => IobTheme;
-export default CustomTheme;
+declare function customTheme(type: ThemeName, overrides?: Record<string, any>): IobTheme;
+export default customTheme;

package/Theme.js

@@ -67,12 +67,12 @@ overlay) {
 /**
  * The theme creation factory function.
  */
-const CustomTheme = (type) => {
+function customTheme(type, overrides) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     let options;
-    let overrides;
+    let localOverrides;
     if (type === 'dark') {
-        overrides = {
+        localOverrides = {
             MuiAppBar: {
                 colorDefault: {
                     backgroundColor: '#272727',
@@ -113,7 +113,7 @@ const CustomTheme = (type) => {
         };
     }
     else if (type === 'blue') {
-        overrides = {
+        localOverrides = {
             MuiAppBar: {
                 colorDefault: {
                     backgroundColor: '#3399CC',
@@ -153,7 +153,7 @@ const CustomTheme = (type) => {
         };
     }
     else if (type === 'colored') {
-        overrides = {
+        localOverrides = {
             MuiAppBar: {
                 colorDefault: {
                     backgroundColor: '#2a3135',
@@ -186,7 +186,7 @@ const CustomTheme = (type) => {
         };
     }
     else if (type === 'PT') {
-        overrides = {
+        localOverrides = {
             MuiAppBar: {
                 colorDefault: {
                     backgroundColor: '#0F99DE',
@@ -218,7 +218,7 @@ const CustomTheme = (type) => {
         };
     }
     else if (type === 'DX') {
-        overrides = {
+        localOverrides = {
             MuiAppBar: {
                 colorDefault: {
                     backgroundColor: '#a9a9a9',
@@ -255,7 +255,7 @@ const CustomTheme = (type) => {
         };
     }
     else {
-        overrides = {
+        localOverrides = {
             MuiLink: {
                 root: {
                     textTransform: 'uppercase',
@@ -273,9 +273,8 @@ const CustomTheme = (type) => {
                 mode: 'light',
                 primary: {
                     main: '#3399CC',
-                    light: undefined,
-                    dark: undefined,
-                    contrastText: undefined,
+                    dark: '#256c97',
+                    light: '#76d0fd',
                 },
                 secondary: {
                     main: '#164477',
@@ -302,8 +301,7 @@ const CustomTheme = (type) => {
     }
     const theme = (0, styles_1.createTheme)(options);
     const palette = theme.palette;
-    return (0, styles_1.createTheme)(theme, {
-        components: Object.assign(Object.assign({}, overrides), { MuiButton: {
+    return (0, styles_1.createTheme)(theme, Object.assign(Object.assign({}, (overrides || undefined)), { components: Object.assign(Object.assign(Object.assign({}, localOverrides), { MuiButton: {
                 variants: [
                     {
                         props: { variant: 'contained', color: 'grey' },
@@ -339,7 +337,6 @@ const CustomTheme = (type) => {
                         },
                     },
                 ],
-            } }),
-    });
-};
-exports.default = CustomTheme;
+            } }), ((overrides === null || overrides === void 0 ? void 0 : overrides.components) || undefined)) }));
+}
+exports.default = customTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "6.0.10",
+  "version": "6.0.12",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",
@@ -30,13 +30,13 @@
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@iobroker/socket-client": "^2.4.18",
-    "@iobroker/types": "^6.0.5",
+    "@iobroker/types": "^6.0.6-alpha.0-20240624-92c3310c8",
     "@iobroker/js-controller-common": "^6.0.5",
     "@iobroker/js-controller-common-db": "^6.0.5",
-    "@mui/icons-material": "^5.15.20",
-    "@mui/material": "^5.15.20",
-    "@mui/x-date-pickers": "^7.7.1",
-    "@sentry/browser": "^8.11.0",
+    "@mui/icons-material": "^5.15.21",
+    "@mui/material": "^5.15.21",
+    "@mui/x-date-pickers": "^7.8.0",
+    "@sentry/browser": "^8.13.0",
     "react-color": "^2.19.3",
     "react-colorful": "^5.6.1",
     "react-cropper": "^2.3.3",