Merge branch 'develop' into k-date-components

learningequality · Dec 8, 2022 · 9fe98f6 · 9fe98f6
2 parents 7ed8ba8 + d24d3d5
commit 9fe98f6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -42,14 +42,5 @@ Addresses #*PR# HERE*
 - [ ] Are all UI components LTR and RTL compliant (if applicable)?
 - [ ] _Add other things to check for here_
 
-## Post-merge updates and tracking
-<!-- After merging, unstable branches of Kolibri products (Learning Platform, Studio, and Data Portal) should be updated to point at the merge commit resulting from this PR. This process should be led by the submitter of the Design System PR in collaboration with other LE team members working on the other product repos. -->
-- [ ] Learning Platform update PR is submitted
-- [ ] Learning Platform update PR is merged
-- [ ] Studio update PR is submitted
-- [ ] Studio update PR is merged
-- [ ] Data Portal update PR is submitted
-- [ ] Data Portal update PR is merged
-
 ## Comments
 <!-- Any additional notes you'd like to add -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,11 +29,13 @@ Releases are recorded as git tags in the [Github releases](https://github.com/le
 - [#185] - Handle arrow key navigation and improve focusOutline
 - [#338] - Allow for new 'nav' slot inline in the toolbar
 - [#362] - Add documentation pages for 'KResponsiveWindow' and 'KResponsiveElement'
+- [#364] - Fixes 'Missing focus ring around password inputs' while navigating with keyboard.
 
 <!-- Referenced PRs -->
 [#185]: https://github.com/learningequality/kolibri-design-system/pull/185
 [#338]: https://github.com/learningequality/kolibri-design-system/pull/338
 [#362]: https://github.com/learningequality/kolibri-design-system/pull/362
+[#364]: https://github.com/learningequality/kolibri-design-system/pull/364
 
 ## Version 1.3.1
 

diff --git a/docs/pages/layout/index.vue b/docs/pages/layout/index.vue
@@ -207,3 +207,13 @@
 
 </template>
 
+
+<script>
+
+  import responsiveWindowMixin from '~~/lib/KResponsiveWindowMixin.js';
+
+  export default {
+    mixins: [responsiveWindowMixin],
+  };
+
+</script>
diff --git a/lib/buttons-and-links/buttonMixin.js b/lib/buttons-and-links/buttonMixin.js
@@ -65,7 +65,7 @@ export default {
         color: this.$themeTokens.link,
         ':hover': { color: this.$themeTokens.linkDark },
         ':focus': this.$coreOutline,
-        ':disabled': { opacity: 0.5 },
+        ...(this.disabled ? disabledStyle : {}),
       };
     },
     primaryRaisedStyle() {

diff --git a/lib/content/mixin.js b/lib/content/mixin.js
@@ -9,6 +9,7 @@ const interactionEvents = [
   'updateContentState',
   'startTracking',
   'navigateTo',
+  'finished',
 ];
 
 const fileFieldMap = {

diff --git a/lib/styles/trackInputModality.js b/lib/styles/trackInputModality.js
@@ -15,10 +15,12 @@ function setUpEventHandlers(disableFocusRingByDefault) {
     'input[type=text]',
     'input[type=radio]',
     'input[type=checkbox]',
+    'input[type=search]',
     'input[type=number]',
     'input[type=date]',
     'input[type=time]',
     'input[type=datetime]',
+    'input[type=password]',
     'textarea',
     '[role=textbox]',
     'a',