Merge 2f899d1 into 984a1be

openhab · Mar 3, 2023 · ffe46b8 · ffe46b8
2 parents 984a1be + 2f899d1
commit ffe46b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/widget-actions.js b/bundles/org.openhab.ui/web/src/components/widgets/widget-actions.js
@@ -103,12 +103,12 @@ export const actionsMixin = {
           const actionsPromise = new Promise((resolve, reject) => {
             if (actionCommandOptions && typeof actionCommandOptions === 'string') {
               resolve(actionCommandOptions.split(',').map((o) => {
-                const parts = o.split('=')
+                const parts = o.trim().split('=')
                 return {
-                  text: parts[1] || parts[0],
+                  text: parts[1].trim() || parts[0].trim(),
                   color: 'blue',
                   onClick: () => {
-                    this.$store.dispatch('sendCommand', { itemName: actionCommandOptionsItem, cmd: parts[0] })
+                    this.$store.dispatch('sendCommand', { itemName: actionCommandOptionsItem, cmd: parts[0].trim() })
                       .then(() => this.showActionFeedback(prefix, actionConfig))
                   }
                 }

diff --git a/bundles/org.openhab.ui/web/src/css/app.styl b/bundles/org.openhab.ui/web/src/css/app.styl
@@ -140,6 +140,10 @@ html
    .delete
      --f7-bars-link-color #ff3b30
 
+// Fix actions-modal/popup is placed behind the notch or outside of the screen on iPhone in openHAB iOS app
+.device-ios .actions-modal
+  max-height: calc(100% - var(--f7-safe-area-top) - var(--f7-safe-area-bottom))
+
 .md .contextual-toolbar
   --f7-theme-color #474747
   --f7-bars-bg-color #474747