fix: enhance typing behavior page (#2890)

Author: ert78gb

packages/uhk-common/src/config-serializer/config-items/advanced-secondary-role-configuration.ts

@@ -32,17 +32,19 @@ export const ADVANCED_SECONDARY_ROLE_CONFIGURATION_FIELD_SET = new Set<keyof Adv
 export interface AdvancedSecondaryRoleConfigurationPreset {
     name: string;
     strategy: SecondaryRoleStrategy;
+    tooltip: string;
     configuration: AdvancedSecondaryRoleConfiguration;
 }
 
 export const CUSTOM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME = 'Custom';
-export const HRM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME = 'HRM';
+export const CUSTOM_ADVANCED_SECONDARY_ROLE_TOOLTIP = 'your individual settings';
 export const TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME = 'Timeout';
 export const SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME = 'Simple';
 
 export const SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondaryRoleConfigurationPreset = {
     name: SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME,
     strategy: SecondaryRoleStrategy.Simple,
+    tooltip: 'hold while tapping another key for secondary, tap for primary',
     configuration: {
         secondaryRoleAdvancedStrategyTimeout: 1000, // TODO: Firngrod, can the timeout be disabled with the new implementation?
         secondaryRoleAdvancedStrategyMinimumHoldTime: 0,
@@ -56,9 +58,10 @@ export const SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecond
     }
 }
 
-export const HRM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondaryRoleConfigurationPreset = {
-    name: HRM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME,
+export const HRM_TIMEOUT_CANCEL_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondaryRoleConfigurationPreset = {
+    name: 'HRM-timeout-cancel',
     strategy: SecondaryRoleStrategy.Advanced,
+    tooltip: 'hold while tapping another key for secondary, tap for primary, hold past timeout for no action',
     configuration: {
         secondaryRoleAdvancedStrategyTimeout: 300,
         secondaryRoleAdvancedStrategyMinimumHoldTime: 150,
@@ -72,9 +75,27 @@ export const HRM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondary
     }
 }
 
+export const HRM_TIMEOUT_SECONDARY_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondaryRoleConfigurationPreset = {
+    name: 'HRM-timeout-secondary',
+    strategy: SecondaryRoleStrategy.Advanced,
+    tooltip: 'hold while tapping another key or hold past timeout for secondary, tap for primary',
+    configuration: {
+        secondaryRoleAdvancedStrategyTimeout: 350,
+        secondaryRoleAdvancedStrategyMinimumHoldTime: 100,
+        secondaryRoleAdvancedStrategyTimeoutAction: SecondaryRoleAdvancedStrategyTimeoutAction.Secondary,
+        secondaryRoleAdvancedStrategyTimeoutType: SecondaryRoleAdvancedStrategyTimeoutType.Active,
+        secondaryRoleAdvancedStrategyTrigger: SecondaryRoleAdvancedStrategyTriggeringEvent.Release,
+        secondaryRoleAdvancedStrategySafetyMargin: 1,
+        secondaryRoleAdvancedStrategyDoubletapToPrimary: true,
+        secondaryRoleAdvancedStrategyTriggerByMouse: false,
+        secondaryRoleAdvancedStrategyTriggerFromSameHalf: false,
+    }
+}
+
 export const TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecondaryRoleConfigurationPreset = {
     name: TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME,
     strategy: SecondaryRoleStrategy.Advanced,
+    tooltip: 'hold until timeout for secondary, briefly tap for primary',
     configuration: {
         secondaryRoleAdvancedStrategyTimeout: 200,
         secondaryRoleAdvancedStrategyMinimumHoldTime: 150,
@@ -91,6 +112,7 @@ export const TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecon
 
 export const BUILTIN_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESETS: AdvancedSecondaryRoleConfigurationPreset[] = [
     SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
-    HRM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
+    HRM_TIMEOUT_CANCEL_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
+    HRM_TIMEOUT_SECONDARY_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
     TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
 ];

packages/uhk-web/src/app/components/device/typing-behavior-page/typing-behavior-page.component.html

@@ -28,6 +28,16 @@ <h3>Secondary roles</h3>
                     {{ preset.name }}
                 </button>
             </div>
+            <circle-tooltip class="mt-2 ms-1"
+                            [tooltip]="presetsTooltip"
+                            [width]="380"/>
+            <ng-template #presetsTooltip>
+                <ng-container *ngFor="let preset of typingBehaviorPresets; trackBy: trackPresets; let isLast = last">
+                    <p [class.mb-0]="isLast">
+                        <span class="fw-bold">{{ preset.name }}</span> - {{ preset.tooltip }}
+                    </p>
+                </ng-container>
+            </ng-template>
         </div>
     </div>
 </div>
@@ -81,8 +91,8 @@ <h5 class="fw-bold d-inline-block">Dual role key</h5>
                                     [width]="380"/>
                     <ng-template #timeoutTypeTooltip>
                         <p>Assume timeout leads to Primary or None:</p>
-                        <p>Active: timeout action is applied immediately when timeout is reached. Secondary role can no longer be activated after timeout was reached.</p>
-                        Passive: timeout action is delayed until release. Secondary role can still be triggered until key release.
+                        <p>activated immediately: timeout action is applied immediately when timeout is reached. Secondary role can no longer be activated after timeout was reached. Correspondence macro value: Active</p>
+                        on uninterrupted release: timeout action is delayed until release. Secondary role can still be triggered until key release. Correspondence macro value: Passive
                     </ng-template>
                 </td>
                 <td>
@@ -98,10 +108,6 @@ <h5 class="fw-bold d-inline-block">Dual role key</h5>
                             />
                         </div>
 
-                        <span>
-                            activated
-                        </span>
-
                         <div class="timeout-action-type-container">
                             <ng-select
                                 [clearable]="false"
@@ -209,7 +215,7 @@ <h5 class="fw-bold d-inline-block">Trigger keys</h5>
                 </td>
             </tr>
             <tr class="separator">
-                <td>Refuse triggers from same half
+                <td>Suppress same-side triggers
                     <circle-tooltip tooltip="When checked, same half keys don't trigger currently pressed secondary role keys."
                                     [width]="250"/>
                 </td>

packages/uhk-web/src/app/components/device/typing-behavior-page/typing-behavior-page.component.scss

@@ -6,7 +6,7 @@
         tbody {
             tr {
                 td:not([colspan='2']):first-of-type {
-                    width: 25%;
+                    width: 21%;
                 }
 
                 td {
@@ -30,7 +30,7 @@
 
                         .timeout-action-type-container {
                             display: inline-block;
-                            width: 250px;
+                            width: 205px;
                         }
                     }
                 }

packages/uhk-web/src/app/components/device/typing-behavior-page/typing-behavior-page.component.ts

@@ -64,11 +64,11 @@ export class TypingBehaviorPage implements AdvancedSecondaryRoleConfiguration, O
     timeoutActionTypeDropdownOptions = [
         {
             id: SecondaryRoleAdvancedStrategyTimeoutType.Active,
-            text: 'Immediately (active)'
+            text: 'activated immediately'
         },
         {
             id: SecondaryRoleAdvancedStrategyTimeoutType.Passive,
-            text: 'Only after Key release (passive)'
+            text: 'on uninterrupted release'
         },
     ]
 

packages/uhk-web/src/app/store/reducers/user-configuration.ts

@@ -9,6 +9,7 @@ import {
     ConnectionsAction,
     Constants,
     CUSTOM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME,
+    CUSTOM_ADVANCED_SECONDARY_ROLE_TOOLTIP,
     emptyHostConnection,
     getDefaultHalvesInfo,
     HalvesInfo,
@@ -1369,6 +1370,7 @@ export const calculateTypingBehaviorPresets = (state: State): TypingBehaviorPres
     result.push({
         name: CUSTOM_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET_NAME,
         strategy: SecondaryRoleStrategy.Advanced,
+        tooltip: CUSTOM_ADVANCED_SECONDARY_ROLE_TOOLTIP,
         configuration: currentConfiguration,
         selected: !hasMatches,
     })