@iobroker/adapter-react-v5 4.12.0 → 4.12.2

package/Components/Icon.d.ts

@@ -13,6 +13,7 @@ interface IconProps {
     /** Styles for utf-8 characters */
     styleUTF8?: React.CSSProperties;
     onError?: ReactEventHandler<HTMLImageElement>;
+    ref?: React.RefObject<HTMLImageElement>;
     /** Alternative text for image */
     alt?: string;
 }

package/Components/Icon.js

@@ -97,6 +97,7 @@ function getSelectIdIcon(obj, imagePrefix) {
 }
 exports.getSelectIdIcon = getSelectIdIcon;
 const REMOTE_SERVER = window.location.hostname.includes('iobroker.in');
+const REMOTE_PREFIX = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/') + 1);
 const Icon = (props) => {
     var _a, _b, _c;
     if (props.src) {
@@ -111,14 +112,17 @@ const Icon = (props) => {
             if (REMOTE_SERVER && !props.src.startsWith('http://') && !props.src.startsWith('https://')) {
                 let src = props.src;
                 if (src.startsWith('./')) {
-                    src = src.substring(2);
+                    src = REMOTE_PREFIX + src.substring(2);
                 }
-                return react_1.default.createElement("img", { title: props.title || undefined, style: props.style || {}, className: Utils_1.default.clsx(props.className, 'iconOwn'), src: `https://remote-files.iobroker.in${window.location.pathname}${src}`, alt: props.alt || undefined, onError: e => {
+                else if (!src.startsWith('/')) {
+                    src = REMOTE_PREFIX + src;
+                }
+                return react_1.default.createElement("img", { title: props.title || undefined, style: props.style || {}, className: Utils_1.default.clsx(props.className, 'iconOwn'), src: `https://remote-files.iobroker.in${src}`, alt: props.alt || undefined, ref: props.ref, onError: e => {
                         // analyse error
                         props.onError && props.onError(e);
                     } });
             }
-            return react_1.default.createElement("img", { title: props.title || undefined, style: props.style || {}, className: Utils_1.default.clsx(props.className, 'iconOwn'), src: props.src, alt: props.alt || undefined, onError: props.onError });
+            return react_1.default.createElement("img", { title: props.title || undefined, style: props.style || {}, className: Utils_1.default.clsx(props.className, 'iconOwn'), src: props.src, alt: props.alt || undefined, ref: props.ref, onError: props.onError });
         }
         return props.src;
     }

package/Components/Image.d.ts

@@ -17,6 +17,7 @@ interface ImageState {
 declare class Image extends Component<ImageProps, ImageState> {
     private svg;
     static REMOTE_SERVER: boolean;
+    static REMOTE_PREFIX: string;
     constructor(props: ImageProps);
     static getDerivedStateFromProps(props: ImageProps, state: ImageState): ImageState;
     getSvgFromData(src: string): React.JSX.Element | null;

package/Components/Image.js

@@ -132,9 +132,12 @@ class Image extends react_1.Component {
             if (Image.REMOTE_SERVER && !this.state.src.startsWith('http://') && !this.state.src.startsWith('https://')) {
                 let src = (this.props.imagePrefix || '') + this.state.src;
                 if (src.startsWith('./')) {
-                    src = src.substring(2);
+                    src = Image.REMOTE_PREFIX + src.substring(2);
                 }
-                return react_1.default.createElement("img", { className: this.props.className, src: src, alt: "", onError: () => (this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })) });
+                else if (!src.startsWith('/')) {
+                    src = Image.REMOTE_PREFIX + src;
+                }
+                return react_1.default.createElement("img", { className: this.props.className, src: `https://remote-files.iobroker.in${src}`, alt: "", onError: () => (this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })) });
             }
             return react_1.default.createElement("img", { className: this.props.className, src: (this.props.imagePrefix || '') + this.state.src, alt: "", onError: () => (this.props.showError ? this.setState({ imgError: true }) : this.setState({ src: '' })) });
         }
@@ -142,4 +145,5 @@ class Image extends react_1.Component {
     }
 }
 Image.REMOTE_SERVER = window.location.hostname.includes('iobroker.in');
+Image.REMOTE_PREFIX = window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/') + 1);
 exports.default = Image;

package/README.md

@@ -670,7 +670,7 @@ socket.getObjectViewCustom('custom', 'state', 'startKey', 'endKey')
 -->
 
 ## Changelog
-### 4.12.0 (2024-03-24)
+### 4.12.2 (2024-03-25)
 * (bluefox) Added support for remote cloud
 
 ### 4.11.6 (2024-03-19)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "4.12.0",
+  "version": "4.12.2",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",