fix toggle #2950

Author: Jonathan

build/change-version.js

@@ -53,9 +53,9 @@ async function replaceRecursively(file, oldVersion, newVersion) {
     return;
   }
 
-  if (VERBOSE) {
-    console.log(`FILE: ${file}`);
-  }
+  //if (VERBOSE) {
+  console.log(`FILE: ${file}`);
+  //}
 
   if (DRY_RUN) {
     return;

package-lock.json

@@ -35,7 +35,7 @@
     "docs": "node ./src/docs/make.js",
     "docs-watch": "node ./src/docs/make.js --watch",
     "release": "npm run eslint && npm run test:silent && npm run build",
-    "release:version": "npm run release && node build/change-version.js",
+    "release:version": "npm run clean && node build/change-version.js \"$npm_config_argv_0\" && npm run release",
     "prepare": "husky install",
     "prettier": "prettier --ignore-unknown --write .",
     "eslint": "npm run prettier && npx eslint --ext .html,.ts ."

package.json

@@ -57,7 +57,7 @@ export default class DateDisplay {
       const div = document.createElement('div');
       div.setAttribute('data-action', ActionTypes.selectDay);
       div.role = 'gridcell';
-      div.tabIndex = -1;
+      div.tabIndex = 0;
       container.appendChild(div);
 
       // if hover is supported then add the events

src/js/display/calendar/date-display.ts

@@ -179,8 +179,19 @@ export default class Display {
           this.optionsStore.options?.display?.placement || 'bottom';
 
         container.appendChild(this.widget);
+        const handleFocus = this._handleFocus.bind(this);
         this.createPopup(this.optionsStore.element, this.widget, {
-          modifiers: [{ name: 'eventListeners', enabled: true }],
+          modifiers: [
+            { name: 'eventListeners', enabled: true },
+            {
+              name: 'focusDate',
+              enabled: true,
+              phase: 'afterWrite',
+              fn() {
+                handleFocus();
+              },
+            },
+          ],
           //#2400
           placement:
             document.documentElement.dir === 'rtl'
@@ -316,7 +327,7 @@ export default class Display {
   updatePopup(): void {
     if (!this._popperInstance) return;
     this._popperInstance.update();
-    this._handleFocus();
+    //this._handleFocus();
   }
 
   /**
@@ -519,7 +530,8 @@ export default class Display {
     if (this.optionsStore.options.display.keyboardNavigation) {
       this.widget.removeEventListener('keydown', this._keyboardEventBound);
     }
-    this.optionsStore.toggle?.focus();
+    if (this.optionsStore.toggle) this.optionsStore.toggle.focus();
+    else if (this.optionsStore.input) this.optionsStore.input.focus();
   }
 
   /**
@@ -1161,6 +1173,7 @@ export default class Display {
     };
 
     const tabTargets: HTMLElement[] = [];
+    console.log(this.optionsStore.currentView);
     switch (this.optionsStore.currentView) {
       case 'clock':
         {

src/js/display/index.ts

@@ -2,7 +2,7 @@
 /*global $, tempusDominus */
 
 /*!
- * Tempus Dominus v6.9.4 (https://getdatepicker.com/)
+ * Tempus Dominus v6.10.3 (https://getdatepicker.com/)
  * Copyright 2013-2021 Jonathan Peterson
  * Licensed under MIT (https://github.com/Eonasdan/tempus-dominus/blob/master/LICENSE)
  */