From 522d279e280720d4075c71eefd4b5d647b087ec5 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Wed, 7 Feb 2024 09:05:05 -0500
Subject: [PATCH] test

---
 .../picker-column-option.tsx                  |  4 --
 .../picker-column/picker-column.scss          | 15 ++++
 .../picker-column/picker-column.tsx           | 69 ++++++++++++++++---
 .../components/picker/test/a11y/index.html    |  2 +-
 4 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/core/src/components/picker-column-option/picker-column-option.tsx b/core/src/components/picker-column-option/picker-column-option.tsx
index 09ab298ede..0200f87d39 100644
--- a/core/src/components/picker-column-option/picker-column-option.tsx
+++ b/core/src/components/picker-column-option/picker-column-option.tsx
@@ -143,10 +143,6 @@ export class PickerColumnOption implements ComponentInterface {
       >
         <button
           aria-label={ariaLabel}
-          aria-selected={selected ? 'true' : 'false'}
-          role={selected ? 'spinbutton' : undefined}
-          aria-hidden={selected ? undefined : 'true'}
-          aria-valuetext={ariaLabel ?? this.el.innerText}
           tabindex="-1"
           disabled={disabled}
           onClick={() => this.onClick()}
diff --git a/core/src/components/picker-column/picker-column.scss b/core/src/components/picker-column/picker-column.scss
index e4008f3824..f2bfc98585 100644
--- a/core/src/components/picker-column/picker-column.scss
+++ b/core/src/components/picker-column/picker-column.scss
@@ -4,6 +4,9 @@
 // --------------------------------------------------
 
 :host {
+
+  position: relative;
+
   display: flex;
 
   align-items: center;
@@ -19,6 +22,18 @@
   text-align: center;
 }
 
+.focusable {
+  position: absolute;
+  pointer-events: none;
+
+  background: rgba(0, 255, 0, 0.1);
+  z-index: 1;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
 .picker-opts {
   /**
    * This padding must be set here and not on the
diff --git a/core/src/components/picker-column/picker-column.tsx b/core/src/components/picker-column/picker-column.tsx
index d5f6cab9cb..d6d150765a 100644
--- a/core/src/components/picker-column/picker-column.tsx
+++ b/core/src/components/picker-column/picker-column.tsx
@@ -215,6 +215,7 @@ export class PickerColumn implements ComponentInterface {
 
   private setPickerItemActiveState = (item: HTMLIonPickerColumnOptionElement, isActive: boolean) => {
     if (isActive) {
+      this.el.shadowRoot!.querySelector('.focusable')!.setAttribute('aria-valuetext', item.innerText)
       item.classList.add(PICKER_ITEM_ACTIVE_CLASS);
     } else {
       item.classList.remove(PICKER_ITEM_ACTIVE_CLASS);
@@ -403,6 +404,8 @@ export class PickerColumn implements ComponentInterface {
           this.canExitInputMode = true;
 
           this.setValue(newActiveElement.value);
+          //newActiveElement.tabIndex = 0;
+          //newActiveElement.focus();
         }, 250);
       });
     };
@@ -466,6 +469,20 @@ export class PickerColumn implements ComponentInterface {
   render() {
     const { color, disabled, isActive, numericInput } = this;
     const mode = getIonMode(this);
+    const opts = Array.from(this.el.querySelectorAll<HTMLIonPickerColumnOptionElement>('ion-picker-column-option'));
+
+    const index = opts.findIndex((option) => {
+      /**
+       * If the whole picker column is disabled, the current value should appear active
+       * If the current value item is specifically disabled, it should not appear active
+       */
+      if (!this.disabled && option.disabled) {
+        return false;
+      }
+
+      return option.value === this.value;
+    });
+
 
     return (
       <Host
@@ -477,7 +494,7 @@ export class PickerColumn implements ComponentInterface {
         })}
       >
         <slot name="prefix"></slot>
-        <div
+        <div class="focusable"
           onKeyDown={(ev) => {
             console.log('helloooo',ev)
 
@@ -498,9 +515,32 @@ export class PickerColumn implements ComponentInterface {
 
             if (index > -1) {
               if (ev.key === 'ArrowDown') {
-                index += 1;
+
+                let el = buttons[index + 1];
+                while(el && el.disabled === true) {
+                  index += 1;
+                  el = buttons[index];
+                }
+
+                console.log('FOUND',el)
+                if (el) {
+                  this.value = el.value;
+                }
+                ev.preventDefault();
+
               } else if (ev.key === 'ArrowUp') {
-                index -= 1;
+                let el = buttons[index - 1];
+                while(el && el.disabled === true) {
+                  index -= 1;
+                  el = buttons[index];
+                }
+
+                console.log('FOUND',el)
+                if (el) {
+                  this.value = el.value;
+                }
+                ev.preventDefault();
+
               }
 
               if (index < 0) {
@@ -511,20 +551,33 @@ export class PickerColumn implements ComponentInterface {
 
               const buttonToFocus = buttons[index];
               if (buttonToFocus) {
-                this.value = buttonToFocus.value;
+                //this.value = buttonToFocus.value;
                 setTimeout(() => {
-                  buttonToFocus.tabIndex = 0;
-                  buttonToFocus.focus();
+                  //buttonToFocus.tabIndex = 0;
+                  //buttonToFocus.focus();
                 }, 500);
               }
 
-              ev.preventDefault();
 
             }
 
           }}
-          class="picker-opts"
+          aria-label="select a month"
+          aria-valuenow={index}
+          aria-valuemax={opts.length - 1}
+          aria-valuemin={0}
+          aria-orientation="vertical"
+          aria-valuetext={this.activeItem?.innerText}
+          role="slider"
           tabindex={disabled ? undefined : 0}
+          onInput={(ev) => {
+            console.log('tEST',ev)
+          }}
+
+        ></div>
+        <div
+          aria-hidden="true"
+          class="picker-opts"
           ref={(el) => {
             this.scrollEl = el;
           }}
diff --git a/core/src/components/picker/test/a11y/index.html b/core/src/components/picker/test/a11y/index.html
index d6f209c9c2..7b230714cb 100644
--- a/core/src/components/picker/test/a11y/index.html
+++ b/core/src/components/picker/test/a11y/index.html
@@ -21,7 +21,7 @@
             <ion-picker-column-option value="2" color="tertiary">Second</ion-picker-column-option>
             <ion-picker-column-option value="3" color="tertiary">Third</ion-picker-column-option>
             <ion-picker-column-option value="4" color="tertiary">Fourth</ion-picker-column-option>
-            <ion-picker-column-option value="5" color="tertiary">Fifth</ion-picker-column-option>
+            <ion-picker-column-option value="5" color="tertiary" disabled="true">Fifth</ion-picker-column-option>
             <ion-picker-column-option value="6" color="tertiary">Sixth</ion-picker-column-option>
             <ion-picker-column-option value="7" color="tertiary">Seventh</ion-picker-column-option>
           </ion-picker-column>