From 269ccdddd2b2a891c1c94f0b6a4024b43f9f9be2 Mon Sep 17 00:00:00 2001
From: Manuel <manuel.geyer@rbb-online.de>
Date: Thu, 18 Jan 2024 13:51:23 +0000
Subject: [PATCH] Commit

---
 fluentui-ard/CanvasManifest.json              |   2 +-
 fluentui-ard/Entropy/AppCheckerResult.sarif   | 122 +++++++++++++++---
 fluentui-ard/Entropy/Entropy.json             |   2 +-
 fluentui-ard/Entropy/checksum.json            |  20 +--
 fluentui-ard/Src/BaseScreen.fx.yaml           |   7 +-
 .../EditorState/BaseScreen.editorstate.json   |  39 ++++++
 6 files changed, 162 insertions(+), 30 deletions(-)

diff --git a/fluentui-ard/CanvasManifest.json b/fluentui-ard/CanvasManifest.json
index e10fc97..c317d79 100644
--- a/fluentui-ard/CanvasManifest.json
+++ b/fluentui-ard/CanvasManifest.json
@@ -11,7 +11,7 @@
   },
   "Properties": {
     "AppCreationSource": "AppFromScratch",
-    "AppDescription": "Tabindex",
+    "AppDescription": "Screen",
     "AppPreviewFlagsMap": {
       "aibuilderserviceenrollment": false,
       "allowmultiplescreensincanvaspages": false,
diff --git a/fluentui-ard/Entropy/AppCheckerResult.sarif b/fluentui-ard/Entropy/AppCheckerResult.sarif
index 758bede..ca07698 100644
--- a/fluentui-ard/Entropy/AppCheckerResult.sarif
+++ b/fluentui-ard/Entropy/AppCheckerResult.sarif
@@ -9,6 +9,36 @@
         }
       ],
       "results": [
+        {
+          "locations": [
+            {
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "BaseScreen.ConFkt1.Fktlabel1.TabIndex"
+                }
+              ],
+              "physicalLocation": {
+                "address": {
+                  "fullyQualifiedName": "BaseScreen.ConFkt1.Fktlabel1.TabIndex",
+                  "relativeAddress": 0
+                }
+              },
+              "properties": {
+                "member": "TabIndex",
+                "module": "BaseScreen",
+                "type": "BaseScreen.ConFkt1.Fktlabel1"
+              }
+            }
+          ],
+          "message": {
+            "id": "issue"
+          },
+          "properties": {
+            "level": "Low"
+          },
+          "ruleId": "acc-TabOrderShouldBeChecked",
+          "ruleIndex": 0
+        },
         {
           "locations": [
             {
@@ -37,7 +67,7 @@
             "level": "Medium"
           },
           "ruleId": "acc-TabIndexShouldBeDefinedForInteractiveControl",
-          "ruleIndex": 0
+          "ruleIndex": 1
         },
         {
           "locations": [
@@ -67,7 +97,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -97,7 +127,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -157,7 +187,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -187,7 +217,7 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -217,7 +247,67 @@
             "level": "Low"
           },
           "ruleId": "acc-TabOrderShouldBeChecked",
-          "ruleIndex": 1
+          "ruleIndex": 0
+        },
+        {
+          "locations": [
+            {
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "BaseScreen.ConBan.Banlabel1.TabIndex"
+                }
+              ],
+              "physicalLocation": {
+                "address": {
+                  "fullyQualifiedName": "BaseScreen.ConBan.Banlabel1.TabIndex",
+                  "relativeAddress": 0
+                }
+              },
+              "properties": {
+                "member": "TabIndex",
+                "module": "BaseScreen",
+                "type": "BaseScreen.ConBan.Banlabel1"
+              }
+            }
+          ],
+          "message": {
+            "id": "issue"
+          },
+          "properties": {
+            "level": "Low"
+          },
+          "ruleId": "acc-TabOrderShouldBeChecked",
+          "ruleIndex": 0
+        },
+        {
+          "locations": [
+            {
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "BaseScreen.ConBan.Logo.TabIndex"
+                }
+              ],
+              "physicalLocation": {
+                "address": {
+                  "fullyQualifiedName": "BaseScreen.ConBan.Logo.TabIndex",
+                  "relativeAddress": 0
+                }
+              },
+              "properties": {
+                "member": "TabIndex",
+                "module": "BaseScreen",
+                "type": "BaseScreen.ConBan.Logo"
+              }
+            }
+          ],
+          "message": {
+            "id": "issue"
+          },
+          "properties": {
+            "level": "Low"
+          },
+          "ruleId": "acc-TabOrderShouldBeChecked",
+          "ruleIndex": 0
         },
         {
           "locations": [
@@ -256,37 +346,37 @@
           "name": "PowerApps app checker",
           "rules": [
             {
-              "id": "acc-TabIndexShouldBeDefinedForInteractiveControl",
+              "id": "acc-TabOrderShouldBeChecked",
               "messageStrings": {
                 "issue": {
-                  "text": "Missing tab stop"
+                  "text": "Check the order of the screen items"
                 }
               },
               "properties": {
                 "componentType": "app",
                 "howToFix": [
-                  "Set TabIndex to 0 or greater to ensure that interactive elements have a tab stop."
+                  "Make sure that your screen elements match the order in which you'd want to tab through them."
                 ],
-                "level": "Medium",
+                "level": "Low",
                 "primaryCategory": "accessibility",
-                "whyFix": "People who use the keyboard with your app will not be able to access this element without a tab stop."
+                "whyFix": "When a screen reader reads the elements of a slide, it's important that they appear in the order that a user would see them, instead of the order they were added to the slide."
               }
             },
             {
-              "id": "acc-TabOrderShouldBeChecked",
+              "id": "acc-TabIndexShouldBeDefinedForInteractiveControl",
               "messageStrings": {
                 "issue": {
-                  "text": "Check the order of the screen items"
+                  "text": "Missing tab stop"
                 }
               },
               "properties": {
                 "componentType": "app",
                 "howToFix": [
-                  "Make sure that your screen elements match the order in which you'd want to tab through them."
+                  "Set TabIndex to 0 or greater to ensure that interactive elements have a tab stop."
                 ],
-                "level": "Low",
+                "level": "Medium",
                 "primaryCategory": "accessibility",
-                "whyFix": "When a screen reader reads the elements of a slide, it's important that they appear in the order that a user would see them, instead of the order they were added to the slide."
+                "whyFix": "People who use the keyboard with your app will not be able to access this element without a tab stop."
               }
             },
             {
diff --git a/fluentui-ard/Entropy/Entropy.json b/fluentui-ard/Entropy/Entropy.json
index 25c12aa..9067970 100644
--- a/fluentui-ard/Entropy/Entropy.json
+++ b/fluentui-ard/Entropy/Entropy.json
@@ -26,7 +26,7 @@
   "DoesTestStepsMetadataExist": true,
   "FunctionParamsInvariantScripts": {},
   "FunctionParamsInvariantScriptsOnInstances": {},
-  "HeaderLastSavedDateTimeUTC": "01/18/2024 13:48:49",
+  "HeaderLastSavedDateTimeUTC": "01/18/2024 13:51:23",
   "IsLegacyComponentAllowGlobalScopeCase": false,
   "LocalConnectionIDReferences": {
     "3949869c-0bc9-4a51-90cd-bf1287c9e326": "\"/providers/microsoft.powerapps/apis/shared_azure-2dopenai-2dconnector-5f1d98e22a441b0e2d-5f3739fab3a930da50/connections/shared-azure-2dopena-3f4cdc89-63b5-4018-882d-1f1c97eb18e0\"",
diff --git a/fluentui-ard/Entropy/checksum.json b/fluentui-ard/Entropy/checksum.json
index 6b2793d..b476e5d 100644
--- a/fluentui-ard/Entropy/checksum.json
+++ b/fluentui-ard/Entropy/checksum.json
@@ -4,14 +4,14 @@
     "IsLocalBuild": false
   },
   "ClientPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_+K4xpZQr8icrIXGqT9hCMM4Hwasp3FKNOqBcLMhqR1k=",
+    "AppCheckerResult.sarif": "C8_tsRBd/dJaB2yaL8OgZrzx/LSubqjh+TYHNgL/UbdJ7M=",
     "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=",
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_eLR4oTrFl8Z+q7ZGWT6VYPAne+PoDRTxIH9VjLEtXFU=",
-    "Header.json": "C8_oVRxYY5z322X7ic+ZccdwgCZfWEiW/2h3PLUrnEmO2k=",
-    "Properties.json": "C8_FP9pr7zTnJTDaZOmAszkdtHwY+Aiwl5k+V7cJP3O6Tk=",
+    "Controls\\4.json": "C8_+PGry9A/cZTM0UAB4F9jfz9sSgT+gK87UHX4MSoh0w8=",
+    "Header.json": "C8_a5pUtAt4qQGqfUzCmVRTmc76fkzhBgI9MjZ38t5hJ8A=",
+    "Properties.json": "C8_i2W0Cb2yeMEda3qXNLxh4wbSXygE/A2ULBEkP/9ysqE=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_/Z3a8U+hQac6bzkZ5btLTX7v5KpJfnJmMoWeHQs4HDA=",
@@ -19,16 +19,16 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ClientStampedChecksum": "C8_16yStUN4pO4ic1jNqeXl6OYwYfAeE195gtaxzrHOtYE=",
+  "ClientStampedChecksum": "C8_eyHRDD5hyIJfeRqqPtLnFZ0wHCeI0mGDR24u3vy9xPs=",
   "ServerPerFileChecksums": {
-    "AppCheckerResult.sarif": "C8_+K4xpZQr8icrIXGqT9hCMM4Hwasp3FKNOqBcLMhqR1k=",
+    "AppCheckerResult.sarif": "C8_tsRBd/dJaB2yaL8OgZrzx/LSubqjh+TYHNgL/UbdJ7M=",
     "AppTests\\2.json": "C8_omA4KVA0ye8qkU+fMWC8nSkoW42AEHM4XBnnYkUJCys=",
     "Assets\\Images\\0001.png": "C8_D0WGiAaxVuIcUWpkdQuVcyQy/gSJZuMRDwL63zxJhAk=",
     "Assets\\Images\\0002.jpg": "C8_Tc/HGdQ62xbtBm/41G1l7DIpMm/RT0cgmhtJyanyURs=",
     "Controls\\1.json": "C8_/PwNEU6dV00x9Xr4Yt93zX1EmsxAh36PVgOdFy9WD8g=",
-    "Controls\\4.json": "C8_eLR4oTrFl8Z+q7ZGWT6VYPAne+PoDRTxIH9VjLEtXFU=",
-    "Header.json": "C8_oVRxYY5z322X7ic+ZccdwgCZfWEiW/2h3PLUrnEmO2k=",
-    "Properties.json": "C8_FP9pr7zTnJTDaZOmAszkdtHwY+Aiwl5k+V7cJP3O6Tk=",
+    "Controls\\4.json": "C8_+PGry9A/cZTM0UAB4F9jfz9sSgT+gK87UHX4MSoh0w8=",
+    "Header.json": "C8_a5pUtAt4qQGqfUzCmVRTmc76fkzhBgI9MjZ38t5hJ8A=",
+    "Properties.json": "C8_i2W0Cb2yeMEda3qXNLxh4wbSXygE/A2ULBEkP/9ysqE=",
     "References\\DataSources.json": "C8_khu+WUDb4a5tvZu/0zvUqAExTFpdTX7df3InxUaD7RQ=",
     "References\\ModernThemes.json": "C8_KDQJ/3t27vgKx25iCQB/PGqxkWE34ZB7Eyb+RxNxY0k=",
     "References\\Resources.json": "C8_/Z3a8U+hQac6bzkZ5btLTX7v5KpJfnJmMoWeHQs4HDA=",
@@ -36,5 +36,5 @@
     "References\\Themes.json": "C8_zuMgLpz3IJQlVgGqo3GtyhriL3PR35GxXf+rtPR4Gfc=",
     "Resources\\PublishInfo.json": "C8_L9UhOWDoS/LUj0KodcbQiXLqewg00O5iSZA4+bCdTGs="
   },
-  "ServerStampedChecksum": "C8_16yStUN4pO4ic1jNqeXl6OYwYfAeE195gtaxzrHOtYE="
+  "ServerStampedChecksum": "C8_eyHRDD5hyIJfeRqqPtLnFZ0wHCeI0mGDR24u3vy9xPs="
 }
\ No newline at end of file
diff --git a/fluentui-ard/Src/BaseScreen.fx.yaml b/fluentui-ard/Src/BaseScreen.fx.yaml
index f2108fd..dded6d5 100644
--- a/fluentui-ard/Src/BaseScreen.fx.yaml
+++ b/fluentui-ard/Src/BaseScreen.fx.yaml
@@ -23,6 +23,7 @@ BaseScreen As screen:
             Height: =ConBan.Height
             Italic: =true
             Size: =ConBan.Height/3.6
+            TabIndex: =7
             Text: |-
                 ="Ask
                 ChatGPT"
@@ -35,6 +36,7 @@ BaseScreen As screen:
             AccessibleLabel: ="ARD Logo"
             Height: =ConBan.Height - (ConBan.Height/6)
             Image: ='ard-logo'
+            TabIndex: =8
             Width: =ConBan.Width/3.5
             X: =ConBan.Width/3
             Y: =ConBan.Y + (ConBan.Height/7)
@@ -66,7 +68,7 @@ BaseScreen As screen:
             PressedBorderColor: =RGBA(0, 52, 128, 1)
             ShowLabel: =false
             Size: =18
-            TabIndex: =4
+            TabIndex: =5
             TrueFill: =RGBA(251, 188, 159, 1)
             TrueHoverFill: =RGBA(251, 188, 159, 1)
             TrueText: ="true"
@@ -90,6 +92,7 @@ BaseScreen As screen:
             Font: =Font.'Segoe UI'
             Height: =Creativity1.Height
             Size: =Creativity1.Height/2
+            TabIndex: =4
             Text: ="Creativity" & Char(10) & "Mode"
             Width: |-
                 =If(ConFkt1.Height<=ConFkt1.Width/6, ConFkt1.Height*1.7, 
@@ -144,7 +147,7 @@ BaseScreen As screen:
             PressedColor: =RGBA(251, 188, 159, 1)
             PressedFill: =RGBA(0, 0, 0, 0)
             Rotation: =20
-            TabIndex: =5
+            TabIndex: =6
             Width: |-
                 =If(ConFkt1.Height<=ConFkt1.Width/6, ConFkt1.Height, 
                 ConFkt1.Height > ConFkt1.Width/6, ConFkt1.Width/6)
diff --git a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
index 69ebf0a..0319f06 100644
--- a/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
+++ b/fluentui-ard/Src/EditorState/BaseScreen.editorstate.json
@@ -133,6 +133,14 @@
           "InvariantPropertyName": "AutoHeight",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "-1",
+          "InvariantPropertyName": "TabIndex",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -348,6 +356,11 @@
           "Category": "Design",
           "PropertyName": "PressedColor",
           "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Design",
+          "PropertyName": "TabIndex",
+          "RuleProviderType": "Unknown"
         }
       ],
       "StyleName": "defaultLabelStyle",
@@ -2773,6 +2786,14 @@
           "InvariantPropertyName": "Visible",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "-1",
+          "InvariantPropertyName": "TabIndex",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -2993,6 +3014,11 @@
           "Category": "Design",
           "PropertyName": "PressedColor",
           "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Design",
+          "PropertyName": "TabIndex",
+          "RuleProviderType": "Unknown"
         }
       ],
       "StyleName": "defaultLabelStyle",
@@ -3072,6 +3098,14 @@
           "InvariantPropertyName": "AccessibleLabel",
           "IsLockable": false,
           "NameMapSourceSchema": "?"
+        },
+        {
+          "AFDDataSourceName": "",
+          "AutoRuleBindingEnabled": false,
+          "AutoRuleBindingString": "-1",
+          "InvariantPropertyName": "TabIndex",
+          "IsLockable": false,
+          "NameMapSourceSchema": "?"
         }
       ],
       "HasDynamicProperties": false,
@@ -3237,6 +3271,11 @@
           "Category": "Design",
           "PropertyName": "PressedFill",
           "RuleProviderType": "Unknown"
+        },
+        {
+          "Category": "Design",
+          "PropertyName": "TabIndex",
+          "RuleProviderType": "Unknown"
         }
       ],
       "StyleName": "defaultImageStyle",
-- 
GitLab