Merge branch 'master' of https://github.com/ioBroker/ioBroker.vis-2

# Conflicts:
#	README.md

README.md

@@ -294,6 +294,10 @@ npm run start
     ### **WORK IN PROGRESS**
 -->
 ## Changelog
+### 2.10.0 (2024-07-07)
+* (bluefox) Removed incompatible package for styles
+* (bluefox) All widgets must be updated
+
 ### 2.9.64 (2024-05-23)
 * (bluefox) Added possibility to clear a text field by button
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.9.64",
+  "version": "2.10.0",
   "packages": [
     "packages/*"
   ],

packages/iobroker.vis-2/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "vis-2",
-    "version": "2.9.64",
+    "version": "2.10.0",
     "news": {
+      "2.10.0": {
+        "en": "Removed incompatible package for styles\nAll widgets must be updated",
+        "de": "Unverträgliches Paket für Styles entfernt\nAlle Widgets müssen aktualisiert werden",
+        "ru": "Удаленный несовместимый пакет для стилей\nВсе виджеты должны быть обновлены",
+        "pt": "Pacote incompatível removido para estilos\nTodos os widgets devem ser atualizados",
+        "nl": "Incompatibel pakket voor stijlen verwijderd\nAlle widgets moeten bijgewerkt worden",
+        "fr": "Enlever le paquet incompatible pour les styles\nTous les widgets doivent être actualisés",
+        "it": "Pacchetto incompatibile rimosso per stili\nTutti i widget devono essere aggiornati",
+        "es": "Paquete incompatible eliminado para estilos\nTodos los widgets deben ser actualizados",
+        "pl": "Usunięty niekompatybilny pakiet stylów\nWszystkie widżety muszą być aktualizowane",
+        "uk": "Видалено несумісний пакет для стилів\nВсі віджети повинні бути оновлені",
+        "zh-cn": "删除样式不兼容的软件包\n所有部件都必须更新"
+      },
       "2.9.64": {
         "en": "Added possibility to clear a text field by button",
         "de": "Möglichkeit hinzugefügt, ein Textfeld per Knopf zu löschen",

packages/iobroker.vis-2/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.vis-2",
   "description": "Next generation graphical user interface for ioBroker.",
-  "version": "2.9.64",
+  "version": "2.10.0",
   "author": {
     "name": "bluefox",
     "email": "[email protected]"

packages/iobroker.vis-2/src/src/Attributes/View/AllViewsDialog.tsx

@@ -18,7 +18,7 @@ import { getViewsWithDifferentValues } from '@/Attributes/View/ApplyProperties';
 import getEditField from '@/Attributes/View/EditField';
 import type { Field } from '@/Attributes/View/Items';
 import { deepClone } from '@/Utils/utils';
-import commonStyles from "@/Utils/styles";
+import commonStyles from '@/Utils/styles';
 
 const styles: { draggableItem: React.CSSProperties } = {
     draggableItem: {

packages/iobroker.vis-2/src/src/Vis/Widgets/Basic/BasicBulb.tsx

@@ -150,9 +150,9 @@ export default class BasicBulb extends VisRxWidget<RxData> {
 
             if (urlTrue) {
                 if (val) {
-                    this.props.socket.getRawSocket().emit('httpGet', urlTrue);
+                    this.props.context.socket.getRawSocket().emit('httpGet', urlTrue);
                 } else {
-                    this.props.socket.getRawSocket().emit('httpGet', urlFalse);
+                    this.props.context.socket.getRawSocket().emit('httpGet', urlFalse);
                 }
             }
         } else if ((finalMin === '' && (val === null || val === '' || val === undefined || val === false || val === 'false')) ||

packages/iobroker.vis-2/src/src/Vis/Widgets/Basic/BasicValueString.tsx

@@ -94,6 +94,7 @@ class BasicValueString extends VisRxWidget<RxData> {
             display: 'flex',
             alignItems: 'center',
         } : {};
+
         return <div className="vis-widget-body">
             <div data-oid={oid} style={style}>
                 {this.state.rxData.icon ? <Icon

packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButton.tsx

@@ -626,7 +626,7 @@ class JQuiButton<P extends JQuiButtonDataProps = JQuiButtonDataProps, S extends
                 window.location.href = this.state.rxData.href;
             }
         } else if (this.state.rxData.url) {
-            this.props.socket.getRawSocket().emit('httpGet', this.state.rxData.url, (data: any) =>
+            this.props.context.socket.getRawSocket().emit('httpGet', this.state.rxData.url, (data: any) =>
                 console.log('httpGet', this.state.rxData.url, data));
         }
 

packages/iobroker.vis-2/src/src/Vis/visBaseWidget.tsx

@@ -23,7 +23,6 @@ import {
     KeyboardReturn,
 } from '@mui/icons-material';
 
-import type { LegacyConnection } from '@iobroker/adapter-react-v5';
 import { I18n, Utils } from '@iobroker/adapter-react-v5';
 
 import { calculateOverflow, deepClone, isVarFinite } from '@/Utils/utils';
@@ -76,10 +75,6 @@ export interface VisBaseWidgetProps {
     refParent: React.RefObject<HTMLElement>;
     // eslint-disable-next-line react/no-unused-prop-types
     customSettings: Record<string, any>;
-    // eslint-disable-next-line react/no-unused-prop-types
-    classes: Record<string, string>;
-    // eslint-disable-next-line react/no-unused-prop-types
-    socket: LegacyConnection;
 }
 
 interface HTMLDivElementResizers extends HTMLDivElement {

packages/types-vis-2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/types-vis-2",
-  "version": "2.9.64",
+  "version": "2.10.0",
   "description": "Types for vis-2",
   "files": [
     "index.d.ts",