From b3f43105b0a1412b11f7ad189843018ce37dbe1a Mon Sep 17 00:00:00 2001
From: Alex Velez <velezllaquealex@gmail.com>
Date: Tue, 16 Jul 2024 06:33:21 -0500
Subject: [PATCH 1/4] Fix language switcher errors

---
 .../LanguageSwitcherModal.vue                 |  1 +
 kolibri/core/package.json                     |  2 +-
 yarn.lock                                     | 50 ++++++++-----------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
index 8d5831c8eb3..9ce3f468efc 100644
--- a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
+++ b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
@@ -5,6 +5,7 @@
     @shouldFocusLastEl="focusLastEl"
   >
     <KModal
+      appendToBody
       :title="coreString('changeLanguageOption')"
       :submitText="coreString('confirmAction')"
       :cancelText="coreString('cancelAction')"
diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index ff021a95ba7..b7a1e6685e3 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.6",
-    "kolibri-design-system": "4.3.2",
+    "kolibri-design-system": "https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.1",
diff --git a/yarn.lock b/yarn.lock
index 977a77f01e2..fc85506777f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7726,6 +7726,25 @@ kolibri-design-system@4.3.2:
     vue-intl "3.1.0"
     xstate "4.38.3"
 
+"kolibri-design-system@https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9":
+  version "4.3.2"
+  resolved "https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9"
+  dependencies:
+    "@vue/composition-api" "1.7.2"
+    aphrodite "https://github.com/learningequality/aphrodite/"
+    autosize "3.0.21"
+    css-element-queries "1.2.0"
+    date-fns "1.30.1"
+    frame-throttle "3.0.0"
+    fuzzysearch "1.0.3"
+    lodash "4.17.21"
+    popper.js "1.16.1"
+    purecss "2.2.0"
+    tippy.js "4.2.1"
+    vue-intl "3.1.0"
+    vue2-teleport "^1.1.4"
+    xstate "4.38.3"
+
 launch-editor-middleware@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.8.0.tgz#e6021d2ceb70830fddf8bbcee5730acb5aa2db58"
@@ -10587,16 +10606,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10655,14 +10665,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11974,16 +11977,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 671ccf1c4012cf6e56dd63f88dad9b9935aa99b2 Mon Sep 17 00:00:00 2001
From: Alex Velez <velezllaquealex@gmail.com>
Date: Thu, 18 Jul 2024 17:28:25 -0500
Subject: [PATCH 2/4] Update appendToRoot prop

---
 .../src/views/language-switcher/LanguageSwitcherModal.vue       | 2 +-
 kolibri/core/package.json                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
index 9ce3f468efc..c91c13426f0 100644
--- a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
+++ b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
@@ -5,7 +5,7 @@
     @shouldFocusLastEl="focusLastEl"
   >
     <KModal
-      appendToBody
+      appendToRoot
       :title="coreString('changeLanguageOption')"
       :submitText="coreString('confirmAction')"
       :cancelText="coreString('cancelAction')"
diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index b7a1e6685e3..902f3469dd4 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.6",
-    "kolibri-design-system": "https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9",
+    "kolibri-design-system": "https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.1",

From a45d54fa93976683f25884f34291c848efe9b387 Mon Sep 17 00:00:00 2001
From: Alex Velez <velezllaquealex@gmail.com>
Date: Mon, 22 Jul 2024 09:47:11 -0500
Subject: [PATCH 3/4] remote teleport on CategorySearchModal

---
 .../CategorySearchModal/index.vue             | 29 ++++++++-----------
 kolibri/plugins/learn/package.json            |  3 --
 yarn.lock                                     |  8 ++---
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/CategorySearchModal/index.vue b/kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/CategorySearchModal/index.vue
index dbc449ef535..08a329d0223 100644
--- a/kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/CategorySearchModal/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/CategorySearchModal/index.vue
@@ -1,23 +1,20 @@
 <template>
 
   <div>
-    <Teleport
+    <KModal
       v-if="windowIsLarge"
-      to="body"
+      appendToRoot
+      :title="$tr('title')"
+      :cancelText="coreString('closeAction')"
+      size="large"
+      @cancel="$emit('cancel')"
     >
-      <KModal
-        :title="$tr('title')"
-        :cancelText="coreString('closeAction')"
-        size="large"
-        @cancel="$emit('cancel')"
-      >
-        <CategorySearchOptions
-          ref="searchOptions"
-          :selectedCategory="selectedCategory"
-          v-on="$listeners"
-        />
-      </KModal>
-    </Teleport>
+      <CategorySearchOptions
+        ref="searchOptions"
+        :selectedCategory="selectedCategory"
+        v-on="$listeners"
+      />
+    </KModal>
     <div v-else>
       <h2>{{ $tr('title') }}</h2>
       <CategorySearchOptions
@@ -33,7 +30,6 @@
 
 <script>
 
-  import Teleport from 'vue2-teleport';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import CategorySearchOptions from './CategorySearchOptions';
@@ -42,7 +38,6 @@
     name: 'CategorySearchModal',
     components: {
       CategorySearchOptions,
-      Teleport,
     },
     mixins: [commonCoreStrings],
     setup() {
diff --git a/kolibri/plugins/learn/package.json b/kolibri/plugins/learn/package.json
index 013e693fd61..b7f917efc4c 100644
--- a/kolibri/plugins/learn/package.json
+++ b/kolibri/plugins/learn/package.json
@@ -3,9 +3,6 @@
   "description": "Learn Plugin for Kolibri",
   "private": true,
   "version": "0.0.1",
-  "dependencies": {
-    "vue2-teleport": "^1.1.4"
-  },
   "devDependencies": {
     "flush-promises": "^1.0.2"
   }
diff --git a/yarn.lock b/yarn.lock
index fc85506777f..2276ee481ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7726,9 +7726,9 @@ kolibri-design-system@4.3.2:
     vue-intl "3.1.0"
     xstate "4.38.3"
 
-"kolibri-design-system@https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9":
+"kolibri-design-system@https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1":
   version "4.3.2"
-  resolved "https://github.com/AlexVelezLl/kolibri-design-system.git#b7c4031c8447c9d06c635efd0e621174a063b2b9"
+  resolved "https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1"
   dependencies:
     "@vue/composition-api" "1.7.2"
     aphrodite "https://github.com/learningequality/aphrodite/"
@@ -7742,7 +7742,7 @@ kolibri-design-system@4.3.2:
     purecss "2.2.0"
     tippy.js "4.2.1"
     vue-intl "3.1.0"
-    vue2-teleport "^1.1.4"
+    vue2-teleport "1.1.4"
     xstate "4.38.3"
 
 launch-editor-middleware@^2.8.0:
@@ -11648,7 +11648,7 @@ vue-virtual-scroller@1.1.2:
     vue-observe-visibility "^0.4.4"
     vue-resize "^0.4.5"
 
-vue2-teleport@^1.1.4:
+vue2-teleport@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/vue2-teleport/-/vue2-teleport-1.1.4.tgz#30c84b1005bf9c208b1c05f4b6147300c54ee846"
   integrity sha512-mGTszyQP6k3sSSk7MBq+PZdVojHYLwg5772hl3UVpu5uaLBqWIZ5eNP6/TjkDrf1XUTTxybvpXC6inpjwO+i/Q==

From e8697a88b51fb836c062a55bcda432522fce40c5 Mon Sep 17 00:00:00 2001
From: Alex Velez <velezllaquealex@gmail.com>
Date: Fri, 26 Jul 2024 15:18:08 -0500
Subject: [PATCH 4/4] Update KDS version

---
 kolibri/core/package.json                     |  2 +-
 packages/kolibri-core-for-export/package.json |  2 +-
 yarn.lock                                     | 35 +++++++------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
index 902f3469dd4..332c2e4b656 100644
--- a/kolibri/core/package.json
+++ b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.6",
-    "kolibri-design-system": "https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1",
+    "kolibri-design-system": "4.4.0",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.1",
diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
index a87966f634c..4394920f63e 100644
--- a/packages/kolibri-core-for-export/package.json
+++ b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.6",
-    "kolibri-design-system": "4.3.2",
+    "kolibri-design-system": "4.4.0",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.1",
diff --git a/yarn.lock b/yarn.lock
index 2276ee481ff..353a01b07eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3017,6 +3017,15 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+"aphrodite@git+https://github.com/learningequality/aphrodite.git":
+  version "2.2.3"
+  uid fdc8d7be8912a5cf17f74ff10f124013c52c3e32
+  resolved "git+https://github.com/learningequality/aphrodite.git#fdc8d7be8912a5cf17f74ff10f124013c52c3e32"
+  dependencies:
+    asap "^2.0.3"
+    inline-style-prefixer "^4.0.2"
+    string-hash "^1.1.3"
+
 "aphrodite@https://github.com/learningequality/aphrodite/":
   version "2.2.3"
   resolved "https://github.com/learningequality/aphrodite/#fdc8d7be8912a5cf17f74ff10f124013c52c3e32"
@@ -7707,28 +7716,10 @@ kolibri-constants@0.2.6:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.6.tgz#d13762862505a3a6ec58a104870b21da96778656"
   integrity sha512-gQaY2wFNFrsB+9+xQNeEcLHixNuZEK+GHyKKr78s/hg8gFU3YVsnhlYp0u+du4XeVwewpyN1ajGb4UrrdF8rTA==
 
-kolibri-design-system@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.3.2.tgz#1779fb5958499bd0cb1a65591a5ec8a82e0a2248"
-  integrity sha512-hsApuzPGAYxkQpcVlVLcY4GSgZAyrOzLLt+CQGj9XM1Lep99kiJuLysyNP0ZxRzmT/kKjx4jvIA8Mi81Ui5pkw==
-  dependencies:
-    "@vue/composition-api" "1.7.2"
-    aphrodite "https://github.com/learningequality/aphrodite/"
-    autosize "3.0.21"
-    css-element-queries "1.2.0"
-    date-fns "1.30.1"
-    frame-throttle "3.0.0"
-    fuzzysearch "1.0.3"
-    lodash "4.17.21"
-    popper.js "1.16.1"
-    purecss "2.2.0"
-    tippy.js "4.2.1"
-    vue-intl "3.1.0"
-    xstate "4.38.3"
-
-"kolibri-design-system@https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1":
-  version "4.3.2"
-  resolved "https://github.com/AlexVelezLl/kolibri-design-system.git#9dbdbea6eb737df147b21247335bc7a6a26b7bf1"
+kolibri-design-system@4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.4.0.tgz#4c230a701beafa9c87dc155b81e68128b02a4bfe"
+  integrity sha512-2oYNVkmY1NcXc3mNJVcphfT/glqQEriq72r0LEN3ILpGOitS99x/sGyHNOQmmww9h8/m4KBAAlD0D8IyE1xd0A==
   dependencies:
     "@vue/composition-api" "1.7.2"
     aphrodite "https://github.com/learningequality/aphrodite/"