From 115e7d2ffc08169b7af13547793fda523c06246d Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 30 Aug 2023 10:26:06 +0200
Subject: [PATCH 01/68] yarn lock

---
 yarn.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 019cede57f7..709353f3269 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3438,7 +3438,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@navikt/aksel-icons@^5.2.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
+"@navikt/aksel-icons@^5.2.1, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
   dependencies:
@@ -3465,8 +3465,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
   dependencies:
-    "@navikt/ds-css": ^5.2.0
-    "@navikt/ds-tokens": ^5.2.0
+    "@navikt/ds-css": ^5.2.1
+    "@navikt/ds-tokens": ^5.2.1
     "@types/jest": ^29.0.0
     concurrently: 7.2.1
     copyfiles: 2.4.1
@@ -3483,7 +3483,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel@workspace:@navikt/aksel"
   dependencies:
-    "@navikt/ds-css": 5.2.0
+    "@navikt/ds-css": 5.2.1
     "@types/inquirer": ^9.0.3
     "@types/jest": ^29.0.0
     axios: 1.3.6
@@ -3507,11 +3507,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-css@*, @navikt/ds-css@5.2.0, @navikt/ds-css@^5.2.0, @navikt/ds-css@workspace:@navikt/core/css":
+"@navikt/ds-css@*, @navikt/ds-css@5.2.1, @navikt/ds-css@^5.2.1, @navikt/ds-css@workspace:@navikt/core/css":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-css@workspace:@navikt/core/css"
   dependencies:
-    "@navikt/ds-tokens": ^5.2.0
+    "@navikt/ds-tokens": ^5.2.1
     cssnano: 6.0.0
     fast-glob: 3.2.11
     lodash: 4.17.21
@@ -3524,12 +3524,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-react@*, @navikt/ds-react@5.2.0, @navikt/ds-react@^5.2.0, @navikt/ds-react@workspace:@navikt/core/react":
+"@navikt/ds-react@*, @navikt/ds-react@5.2.1, @navikt/ds-react@^5.2.1, @navikt/ds-react@workspace:@navikt/core/react":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-react@workspace:@navikt/core/react"
   dependencies:
     "@floating-ui/react": 0.24.1
-    "@navikt/aksel-icons": ^5.2.0
+    "@navikt/aksel-icons": ^5.2.1
     "@radix-ui/react-tabs": 1.0.0
     "@radix-ui/react-toggle-group": 1.0.0
     "@testing-library/dom": 8.13.0
@@ -3563,11 +3563,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tailwind@^5.2.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
+"@navikt/ds-tailwind@^5.2.1, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
   dependencies:
-    "@navikt/ds-tokens": ^5.2.0
+    "@navikt/ds-tokens": ^5.2.1
     "@types/jest": ^29.0.0
     color: 4.2.3
     jest: ^29.0.0
@@ -3578,7 +3578,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tokens@^5.2.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
+"@navikt/ds-tokens@^5.2.1, @navikt/ds-tokens@workspace:@navikt/core/tokens":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
   dependencies:
@@ -8593,11 +8593,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "aksel.nav.no@workspace:aksel.nav.no"
   dependencies:
-    "@navikt/aksel-icons": ^5.2.0
-    "@navikt/ds-css": ^5.2.0
-    "@navikt/ds-react": ^5.2.0
-    "@navikt/ds-tailwind": ^5.2.0
-    "@navikt/ds-tokens": ^5.2.0
+    "@navikt/aksel-icons": ^5.2.1
+    "@navikt/ds-css": ^5.2.1
+    "@navikt/ds-react": ^5.2.1
+    "@navikt/ds-tailwind": ^5.2.1
+    "@navikt/ds-tokens": ^5.2.1
     prettier-plugin-tailwindcss: ^0.2.3
   languageName: unknown
   linkType: soft
@@ -23686,8 +23686,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "shadow-dom@workspace:examples/shadow-dom"
   dependencies:
-    "@navikt/ds-css": 5.2.0
-    "@navikt/ds-react": 5.2.0
+    "@navikt/ds-css": 5.2.1
+    "@navikt/ds-react": 5.2.1
     "@types/react": ^18.0.0
     "@types/react-dom": ^18.0.0
     "@vitejs/plugin-react": ^3.1.0

From dadb8de77ee1e2e6b48bf0e4dd472ec01a3da0b7 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 30 Aug 2023 10:57:40 +0200
Subject: [PATCH 02/68] setting up maxSelectedOptions

---
 .../src/form/combobox/ComboboxProvider.tsx    |  2 ++
 .../FilteredOptions/FilteredOptions.tsx       | 15 +++++++++++--
 .../selectedOptionsContext.tsx                |  4 ++++
 .../src/form/combobox/combobox.stories.tsx    | 22 ++++++++++++++++---
 @navikt/core/react/src/form/combobox/types.ts |  5 +++++
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
index 87f59feb9f2..3550b69a3fa 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
@@ -43,6 +43,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
       isMultiSelect,
       onToggleSelected,
       selectedOptions,
+      maxSelectedOptions,
       options,
       value,
       onChange,
@@ -71,6 +72,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
               allowNewValues,
               isMultiSelect,
               selectedOptions,
+              maxSelectedOptions,
               onToggleSelected,
               options,
             }}
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index ef94a969407..7ac625bd87e 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -25,7 +25,7 @@ const FilteredOptions = () => {
     setFilteredOptionsIndex,
     toggleIsListOpen,
   } = useFilteredOptionsContext();
-  const { isMultiSelect, selectedOptions, toggleOption } =
+  const { isMultiSelect, selectedOptions, toggleOption, maxSelectedOptions } =
     useSelectedOptionsContext();
 
   return (
@@ -39,9 +39,20 @@ const FilteredOptions = () => {
       role="listbox"
       tabIndex={-1}
     >
+      {maxSelectedOptions != null &&
+        selectedOptions.length >= maxSelectedOptions && (
+          <li
+            className="navds-combobox__list-item__max-selected"
+            role="option"
+            aria-selected={false}
+            id={`${id}-max-selected`}
+          >
+            ({`${selectedOptions.length} av ${maxSelectedOptions} er valgt`})
+          </li>
+        )}
       {isLoading && (
         <li
-          className="navds-combobox__list-item--loading"
+          className="navds-combobox__list-item__loading"
           role="option"
           aria-selected={false}
           id={`${id}-is-loading`}
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
index 576d957318e..ef983decbeb 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
@@ -16,6 +16,7 @@ type SelectedOptionsContextType = {
   removeSelectedOption: (option: string) => void;
   prevSelectedOptions?: string[];
   selectedOptions: string[];
+  maxSelectedOptions?: number;
   setSelectedOptions: (any) => void;
   toggleOption: (
     option: string,
@@ -39,6 +40,7 @@ export const SelectedOptionsProvider = ({
     | "options"
     | "selectedOptions"
     | "onToggleSelected"
+    | "maxSelectedOptions"
   >;
 }) => {
   const { clearInput, focusInput } = useInputContext();
@@ -54,6 +56,7 @@ export const SelectedOptionsProvider = ({
     selectedOptions: externalSelectedOptions,
     onToggleSelected,
     options,
+    maxSelectedOptions,
   } = value;
   const [internalSelectedOptions, setSelectedOptions] = useState<string[]>([]);
   const selectedOptions = useMemo(
@@ -137,6 +140,7 @@ export const SelectedOptionsProvider = ({
     selectedOptions,
     setSelectedOptions,
     toggleOption,
+    maxSelectedOptions,
   };
 
   return (
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 866fc58c02b..7d58aa08acb 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -171,7 +171,9 @@ export const MultiSelectWithExternalChips = (props) => {
         isMultiSelect
         value={props.controlled ? value : undefined}
         onChange={(event) =>
-          props.controlled ? setValue(event.currentTarget.value) : undefined
+          event && props.controlled
+            ? setValue(event.currentTarget.value)
+            : undefined
         }
         label="Komboboks"
         size="medium"
@@ -220,7 +222,7 @@ export function ComboboxWithNoHits(props) {
         label="Komboboks (uten søketreff)"
         options={props.options}
         value={value}
-        onChange={(event) => setValue(event.currentTarget.value)}
+        onChange={(event) => setValue(event?.currentTarget.value)}
         isListOpen={true}
       />
     </DemoContainer>
@@ -263,7 +265,7 @@ export const Controlled = (props) => {
         filteredOptions={filteredOptions}
         isMultiSelect
         options={props.options}
-        onChange={(event) => setValue(event.target.value)}
+        onChange={(event) => setValue(event?.target.value)}
         onToggleSelected={onToggleSelected}
         selectedOptions={selectedOptions}
         value={value}
@@ -316,6 +318,20 @@ ComboboxSizes.args = {
   options,
 };
 
+export const WithMaxFourChoices = (props) => {
+  const id = useId();
+  return (
+    <DemoContainer dataTheme={props.darkMode}>
+      <UNSAFE_Combobox
+        id={id}
+        label="Komboboks (uten søketreff)"
+        options={props.options}
+        maxSelectedOptions={4}
+      />
+    </DemoContainer>
+  );
+};
+
 export const WithError = {
   args: {
     error: "Du må velge en favorittfrukt.",
diff --git a/@navikt/core/react/src/form/combobox/types.ts b/@navikt/core/react/src/form/combobox/types.ts
index 7acd4812d93..7a2e2274028 100644
--- a/@navikt/core/react/src/form/combobox/types.ts
+++ b/@navikt/core/react/src/form/combobox/types.ts
@@ -97,6 +97,11 @@ export interface ComboboxProps
    * e.g. for a filter, where options can be toggled elsewhere/programmatically.
    */
   selectedOptions?: string[];
+  /**
+   * Maximum number of selected options.
+   * If set, the remaining options will be disabled when the limit is reached.
+   */
+  maxSelectedOptions?: number;
   /**
    * Set to "true" to enable inline autocomplete.
    *

From 7b84aef24c01cbb21fe11fdc707a066cbf7f1de7 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Thu, 7 Sep 2023 10:33:03 +0200
Subject: [PATCH 03/68] added correct margin

---
 @navikt/core/css/form/combobox.css            | 33 ++++++++++++++-----
 @navikt/core/css/tokens.json                  |  2 ++
 .../FilteredOptions/FilteredOptions.tsx       | 19 ++++++-----
 .../src/form/combobox/combobox.stories.tsx    | 16 +++++++--
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 4786d5a21d4..1011931b4bd 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -215,11 +215,22 @@
   padding: 0;
   box-shadow: var(--a-shadow-small);
   border-radius: var(--a-border-radius-medium);
-  gap: var(--a-spacing-1) 0;
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
   color: var(--ac-combobox-list-text, var(--a-text-default));
 }
 
+.navds-combobox__list :where(li) {
+  margin: var(--a-spacing-05) 0;
+}
+
+.navds-combobox__list :where(li:first-child) {
+  margin: 0 0 var(--a-spacing-05);
+}
+
+.navds-combobox__list :where(li:last-child) {
+  margin: var(--a-spacing-05) 0 0;
+}
+
 .navds-combobox__list--closed {
   display: none;
 }
@@ -229,9 +240,7 @@
   width: 1.5rem;
 }
 
-.navds-combobox__list-item,
-.navds-combobox__list-item__no-options,
-.navds-combobox__list-item__new-option {
+.navds-combobox__list-item {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -247,12 +256,20 @@
   padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
 }
 
-.navds-combobox__list-item--loading {
-  display: flex;
+.navds-combobox__list-item__loading {
   justify-content: center;
-  padding: var(--a-spacing-3);
   background-color: var(--ac-combobox-list-item-loading-bg, var(--a-surface-default));
-  width: 100%;
+}
+
+.navds-combobox__list-item__max-selected {
+  background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
+  border-radius: 3px 3px 0 0;
+  box-shadow: inset 0 0 0 1px var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
+  margin-bottom: 0;
+}
+
+.navds-combobox__list-item__max-selected + li {
+  margin-top: 0;
 }
 
 .navds-combobox__list-item--focus,
diff --git a/@navikt/core/css/tokens.json b/@navikt/core/css/tokens.json
index c46a8c5eed1..969ca184ba4 100644
--- a/@navikt/core/css/tokens.json
+++ b/@navikt/core/css/tokens.json
@@ -391,6 +391,8 @@
     "--ac-combobox-list-item-loading-bg": "--a-surface-default",
     "--ac-combobox-list-item-hover-border-left": "--a-border-strong",
     "--ac-combobox-list-item-selected-hover-border-left": "--a-border-focus",
+    "--ac-combobox-list-item-max-selected-bg": "--a-surface-info-subtle",
+    "--ac-combobox-list-item-max-selected-border": "--a-border-info",
     "--ac-combobox-error-border": "--a-border-danger"
   },
   "select": {
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 7ac625bd87e..57838700afe 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -42,17 +42,17 @@ const FilteredOptions = () => {
       {maxSelectedOptions != null &&
         selectedOptions.length >= maxSelectedOptions && (
           <li
-            className="navds-combobox__list-item__max-selected"
+            className="navds-combobox__list-item navds-combobox__list-item__max-selected"
             role="option"
             aria-selected={false}
             id={`${id}-max-selected`}
           >
-            ({`${selectedOptions.length} av ${maxSelectedOptions} er valgt`})
+            {`${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
           </li>
         )}
       {isLoading && (
         <li
-          className="navds-combobox__list-item__loading"
+          className="navds-combobox__list-item navds-combobox__list-item__loading"
           role="option"
           aria-selected={false}
           id={`${id}-is-loading`}
@@ -75,10 +75,13 @@ const FilteredOptions = () => {
               toggleIsListOpen(false);
           }}
           id={`${id}-combobox-new-option`}
-          className={cl("navds-combobox__list-item__new-option", {
-            "navds-combobox__list-item__new-option--focus":
-              filteredOptionsIndex === -1,
-          })}
+          className={cl(
+            "navds-combobox__list-item navds-combobox__list-item__new-option",
+            {
+              "navds-combobox__list-item__new-option--focus":
+                filteredOptionsIndex === -1,
+            }
+          )}
           role="option"
           aria-selected={false}
         >
@@ -93,7 +96,7 @@ const FilteredOptions = () => {
       )}
       {!isLoading && filteredOptions.length === 0 && (
         <li
-          className="navds-combobox__list-item__no-options"
+          className="navds-combobox__list-item navds-combobox__list-item__no-options"
           role="option"
           aria-selected={false}
           id={`${id}-no-hits`}
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 7d58aa08acb..cca287ecefd 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -318,20 +318,30 @@ ComboboxSizes.args = {
   options,
 };
 
-export const WithMaxFourChoices = (props) => {
+export const MaxSelectedOptions = (props) => {
   const id = useId();
   return (
     <DemoContainer dataTheme={props.darkMode}>
       <UNSAFE_Combobox
         id={id}
-        label="Komboboks (uten søketreff)"
+        label="Komboboks med begrenset antall valg"
         options={props.options}
-        maxSelectedOptions={4}
+        maxSelectedOptions={2}
+        selectedOptions={props.selectedOptions}
+        isMultiSelect
+        allowNewValues
+        isListOpen
+        value="a"
       />
     </DemoContainer>
   );
 };
 
+MaxSelectedOptions.args = {
+  options,
+  selectedOptions: [options[0], options[1]],
+};
+
 export const WithError = {
   args: {
     error: "Du må velge en favorittfrukt.",

From d83baba3d67848dae67f9ffbf7e32cfb7757c394 Mon Sep 17 00:00:00 2001
From: Lars Eirik Korsgaard Hansen
 <71271458+larseirikhansen@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:06:50 +0200
Subject: [PATCH 04/68] Update tsconfig.build.json

---
 tsconfig.build.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tsconfig.build.json b/tsconfig.build.json
index 10a36110a2c..b780240ac27 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -1,4 +1,9 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["**/stories", "**/*.stories.*", "**/*.test.*", "**/*.e2e.*"]
+  "exclude": [
+    "**/stories",
+    "**/*.stories.*",
+    "**/*.test.*",
+    "**/*.e2e.*"
+  ]
 }

From bd4212eebb8713e4327b8f7b2deb1ecd75eaaafe Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 15 Sep 2023 10:52:10 +0200
Subject: [PATCH 05/68] Make border of "max selected"-item in FilteredOptions
 overlap the list border

---
 @navikt/core/css/form/combobox.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 1011931b4bd..16fee6f1674 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -217,6 +217,7 @@
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
   color: var(--ac-combobox-list-text, var(--a-text-default));
+  overflow: visible;
 }
 
 .navds-combobox__list :where(li) {
@@ -264,7 +265,7 @@
 .navds-combobox__list-item__max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
   border-radius: 3px 3px 0 0;
-  box-shadow: inset 0 0 0 1px var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
+  box-shadow: 0 0 0 1px var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: 0;
 }
 

From 1ec63c3635db55612864c98753b2b44ab6f765cc Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 15 Sep 2023 10:58:09 +0200
Subject: [PATCH 06/68] Hide "add new value"-button if "max selected"-limit is
 reached

---
 .../FilteredOptions/FilteredOptions.tsx       | 32 +++++++++++--------
 .../selectedOptionsContext.tsx                |  5 +++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 57838700afe..de7d94e25ad 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -25,8 +25,13 @@ const FilteredOptions = () => {
     setFilteredOptionsIndex,
     toggleIsListOpen,
   } = useFilteredOptionsContext();
-  const { isMultiSelect, selectedOptions, toggleOption, maxSelectedOptions } =
-    useSelectedOptionsContext();
+  const {
+    canSelectMoreOptions,
+    isMultiSelect,
+    selectedOptions,
+    toggleOption,
+    maxSelectedOptions,
+  } = useSelectedOptionsContext();
 
   return (
     <ul
@@ -39,17 +44,16 @@ const FilteredOptions = () => {
       role="listbox"
       tabIndex={-1}
     >
-      {maxSelectedOptions != null &&
-        selectedOptions.length >= maxSelectedOptions && (
-          <li
-            className="navds-combobox__list-item navds-combobox__list-item__max-selected"
-            role="option"
-            aria-selected={false}
-            id={`${id}-max-selected`}
-          >
-            {`${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
-          </li>
-        )}
+      {!canSelectMoreOptions && (
+        <li
+          className="navds-combobox__list-item navds-combobox__list-item__max-selected"
+          role="option"
+          aria-selected={false}
+          id={`${id}-max-selected`}
+        >
+          {`${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
+        </li>
+      )}
       {isLoading && (
         <li
           className="navds-combobox__list-item navds-combobox__list-item__loading"
@@ -60,7 +64,7 @@ const FilteredOptions = () => {
           <Loader aria-label="Søker..." />
         </li>
       )}
-      {isValueNew && allowNewValues && (
+      {isValueNew && canSelectMoreOptions && allowNewValues && (
         <li
           tabIndex={-1}
           onMouseMove={() => {
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
index ef983decbeb..11d14945e05 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
@@ -12,6 +12,7 @@ import { useCustomOptionsContext } from "../customOptionsContext";
 
 type SelectedOptionsContextType = {
   addSelectedOption: (option: string) => void;
+  canSelectMoreOptions: boolean;
   isMultiSelect?: boolean;
   removeSelectedOption: (option: string) => void;
   prevSelectedOptions?: string[];
@@ -132,8 +133,12 @@ export const SelectedOptionsProvider = ({
 
   const prevSelectedOptions = usePrevious<string[]>(selectedOptions);
 
+  const canSelectMoreOptions =
+    !maxSelectedOptions || selectedOptions.length < maxSelectedOptions;
+
   const selectedOptionsState = {
     addSelectedOption,
+    canSelectMoreOptions,
     isMultiSelect,
     removeSelectedOption,
     prevSelectedOptions,

From db314b7c141f983883da2230b3488fa0e05e7668 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 15 Sep 2023 10:58:42 +0200
Subject: [PATCH 07/68] Make MaxSelected example a bit more interactive

---
 .../react/src/form/combobox/combobox.stories.tsx  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 737072ca0a6..8ffaf21e877 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -288,17 +288,28 @@ export const ComboboxSizes = () => (
 
 export const MaxSelectedOptions = () => {
   const id = useId();
+  const [value, setValue] = useState<string | undefined>("a");
+  const [selectedOptions, setSelectedOptions] = useState([
+    options[0],
+    options[1],
+  ]);
   return (
     <UNSAFE_Combobox
       id={id}
       label="Komboboks med begrenset antall valg"
       options={options}
       maxSelectedOptions={2}
-      selectedOptions={[options[0], options[1]]}
+      selectedOptions={selectedOptions}
+      onToggleSelected={(option, isSelected) =>
+        isSelected
+          ? setSelectedOptions([...selectedOptions, option])
+          : setSelectedOptions(selectedOptions.filter((o) => o !== option))
+      }
       isMultiSelect
       allowNewValues
       isListOpen
-      value="a"
+      value={value}
+      onChange={(event) => setValue(event?.target.value)}
     />
   );
 };

From 7e5df440e25e4e333c8661cc25ab48db9bdb8105 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Mon, 18 Sep 2023 10:38:14 +0200
Subject: [PATCH 08/68] wip styling max-selected option

---
 @navikt/core/css/form/combobox.css                     | 10 ++++++++++
 .../core/react/src/form/combobox/combobox.stories.tsx  |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 1011931b4bd..4a56a0e9f7e 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -272,6 +272,16 @@
   margin-top: 0;
 }
 
+.navds-combobox__list-item__no-options:hover,
+.navds-combobox__list-item__loading:hover,
+.navds-combobox__list-item__max-selected:hover {
+  cursor: default;
+}
+
+.navds-combobox__list-item__max-selected:hover {
+  background-color: unset;
+}
+
 .navds-combobox__list-item--focus,
 .navds-combobox__list--with-hover .navds-combobox__list-item:hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 737072ca0a6..b63a59990b3 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -293,12 +293,10 @@ export const MaxSelectedOptions = () => {
       id={id}
       label="Komboboks med begrenset antall valg"
       options={options}
-      maxSelectedOptions={2}
-      selectedOptions={[options[0], options[1]]}
+      maxSelectedOptions={1}
       isMultiSelect
       allowNewValues
       isListOpen
-      value="a"
     />
   );
 };

From ebdd227261e284f15ee378caf09092526fd852dd Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 1 Nov 2023 15:21:34 +0100
Subject: [PATCH 09/68] Disable filteredOptions that are not selected when
 maxSelectedOptions is reached

---
 @navikt/core/css/form/combobox.css                       | 9 +++++++++
 .../form/combobox/FilteredOptions/FilteredOptions.tsx    | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 16fee6f1674..11aef320c3b 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -286,6 +286,15 @@
   padding-left: calc(var(--a-spacing-2) - 4px);
 }
 
+.navds-combobox__list-item:has(.navds-combobox__list-item__new-option)[data-no-focus="true"] {
+  background: var(--a-surface-neutral-subtle);
+}
+
+.navds-combobox__list-item:not(.navds-combobox__list-item__max-selected)[data-no-focus="true"] {
+  cursor: not-allowed;
+  opacity: 0.4;
+}
+
 .navds-combobox__list-item--selected {
   background-color: var(--ac-combobox-list-item-selected-bg, var(--a-surface-selected));
 }
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index e91770d8d78..7555f42a94f 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -35,6 +35,9 @@ const FilteredOptions = () => {
     maxSelectedOptions,
   } = useSelectedOptionsContext();
 
+  const isDisabled = (option) =>
+    !canSelectMoreOptions && !selectedOptions.includes(option);
+
   return (
     <ul
       ref={setFilteredOptionsRef}
@@ -52,6 +55,7 @@ const FilteredOptions = () => {
           role="option"
           aria-selected={false}
           id={`${id}-max-selected`}
+          data-no-focus="true"
         >
           {`${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
         </li>
@@ -124,6 +128,7 @@ const FilteredOptions = () => {
             "navds-combobox__list-item--selected":
               selectedOptions.includes(option),
           })}
+          data-no-focus={isDisabled(option) || undefined}
           id={filteredOptionsUtil.getOptionId(id, option)}
           key={option}
           tabIndex={-1}
@@ -138,6 +143,9 @@ const FilteredOptions = () => {
             }
           }}
           onPointerUp={(event) => {
+            if (isDisabled(option)) {
+              return;
+            }
             toggleOption(option, event);
             if (!isMultiSelect && !selectedOptions.includes(option))
               toggleIsListOpen(false);

From 5ce1746c085342f4531fef6d77984b848e78055a Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 1 Nov 2023 15:26:00 +0100
Subject: [PATCH 10/68] Fix scrolling/clipping content in FilteredOptions

---
 @navikt/core/css/form/combobox.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 11aef320c3b..e2d2d9fcdb3 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -217,7 +217,6 @@
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
   color: var(--ac-combobox-list-text, var(--a-text-default));
-  overflow: visible;
 }
 
 .navds-combobox__list :where(li) {
@@ -265,7 +264,7 @@
 .navds-combobox__list-item__max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
   border-radius: 3px 3px 0 0;
-  box-shadow: 0 0 0 1px var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
+  border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: 0;
 }
 

From 1aeb618bc4cbef93b16659d2e30d3a2a07e1853d Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Tue, 7 Nov 2023 11:33:32 +0100
Subject: [PATCH 11/68] Remove hover-effects from non-selectable options

---
 @navikt/core/css/form/combobox.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index e2d2d9fcdb3..7631a9c40a4 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -273,7 +273,7 @@
 }
 
 .navds-combobox__list-item--focus,
-.navds-combobox__list--with-hover .navds-combobox__list-item:hover {
+.navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
   cursor: pointer;
   border-left: 4px solid var(--ac-combobox-list-item-hover-border-left, var(--a-border-strong));

From 646f55ee775f7d31d70ff6407413c0c3baa6ef6d Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Tue, 21 Nov 2023 10:38:39 +0100
Subject: [PATCH 12/68] add prop so user can customize message shown when max
 num of choices reached

---
 @navikt/core/react/src/form/combobox/ComboboxProvider.tsx | 2 ++
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx | 5 ++++-
 .../combobox/SelectedOptions/selectedOptionsContext.tsx   | 4 ++++
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 3 +++
 @navikt/core/react/src/form/combobox/types.ts             | 8 ++++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
index f3b9b0cb399..b1829a0d9e1 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
@@ -44,6 +44,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
       onToggleSelected,
       selectedOptions,
       maxSelectedOptions,
+      maxSelectedMessage,
       options,
       value,
       onChange,
@@ -73,6 +74,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
               isMultiSelect,
               selectedOptions,
               maxSelectedOptions,
+              maxSelectedMessage,
               onToggleSelected,
               options,
             }}
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 1f2a030ab43..77dabec0638 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -33,6 +33,7 @@ const FilteredOptions = () => {
     selectedOptions,
     toggleOption,
     maxSelectedOptions,
+    maxSelectedMessage,
   } = useSelectedOptionsContext();
 
   return (
@@ -53,7 +54,9 @@ const FilteredOptions = () => {
           aria-selected={false}
           id={`${id}-max-selected`}
         >
-          {`${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
+          {maxSelectedMessage && maxSelectedOptions
+            ? maxSelectedMessage(selectedOptions.length, maxSelectedOptions)
+            : `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
         </li>
       )}
       {isLoading && (
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
index 26cc010c318..5482420fd2a 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
@@ -19,6 +19,7 @@ type SelectedOptionsContextType = {
   selectedOptions: string[];
   maxSelectedOptions?: number;
   setSelectedOptions: (any) => void;
+  maxSelectedMessage?: (current: number, max: number) => string;
   toggleOption: (
     option: string,
     event: React.KeyboardEvent | React.PointerEvent
@@ -42,6 +43,7 @@ export const SelectedOptionsProvider = ({
     | "selectedOptions"
     | "onToggleSelected"
     | "maxSelectedOptions"
+    | "maxSelectedMessage"
   >;
 }) => {
   const { clearInput, focusInput } = useInputContext();
@@ -58,6 +60,7 @@ export const SelectedOptionsProvider = ({
     onToggleSelected,
     options,
     maxSelectedOptions,
+    maxSelectedMessage,
   } = value;
   const [internalSelectedOptions, setSelectedOptions] = useState<string[]>([]);
   const selectedOptions = useMemo(
@@ -146,6 +149,7 @@ export const SelectedOptionsProvider = ({
     setSelectedOptions,
     toggleOption,
     maxSelectedOptions,
+    maxSelectedMessage,
   };
 
   return (
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 2c23629dc8a..438e50a8fad 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -298,6 +298,9 @@ export const MaxSelectedOptions: StoryFunction = () => {
       label="Komboboks med begrenset antall valg"
       options={options}
       maxSelectedOptions={2}
+      maxSelectedMessage={(current, max) =>
+        `${current} av MAKS ${max} er valgt.`
+      }
       selectedOptions={selectedOptions}
       onToggleSelected={(option, isSelected) =>
         isSelected
diff --git a/@navikt/core/react/src/form/combobox/types.ts b/@navikt/core/react/src/form/combobox/types.ts
index 7a2e2274028..be3d41c3fa5 100644
--- a/@navikt/core/react/src/form/combobox/types.ts
+++ b/@navikt/core/react/src/form/combobox/types.ts
@@ -102,6 +102,14 @@ export interface ComboboxProps
    * If set, the remaining options will be disabled when the limit is reached.
    */
   maxSelectedOptions?: number;
+  /**
+   * Message to display when the maximum number of selected options is reached.
+   *
+   * @param current - The current number of selected options
+   * @param max - The maximum number of selected options
+   * @returns The string / interpolated string to display
+   */
+  maxSelectedMessage?: (current: number, max: number) => string;
   /**
    * Set to "true" to enable inline autocomplete.
    *

From dd856a84e6e601826444749e3a15064d72d2141c Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 23 Nov 2023 15:34:11 +0100
Subject: [PATCH 13/68] Operate directly on the DOM nodes when moving virtual
 focus, instead of relying on index state.

The index state became stale/non-synced when replacing elements in the list.
---
 .../FilteredOptions/useVirtualFocus.ts        | 104 +++++++++++-------
 1 file changed, 65 insertions(+), 39 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index 3df5b0f1b0a..670860b4b74 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -1,11 +1,10 @@
-import { Dispatch, SetStateAction, useState } from "react";
+import { useState } from "react";
 
 export type VirtualFocusType = {
   activeElement: HTMLElement | undefined;
   getElementById: (id: string) => HTMLElement | undefined;
   isFocusOnTheTop: boolean;
   isFocusOnTheBottom: boolean;
-  setIndex: Dispatch<SetStateAction<number>>;
   moveFocusUp: () => void;
   moveFocusDown: () => void;
   moveFocusToElement: (id: string) => void;
@@ -16,57 +15,85 @@ export type VirtualFocusType = {
 const useVirtualFocus = (
   containerRef: HTMLElement | null
 ): VirtualFocusType => {
-  const [index, setIndex] = useState(-1);
-
-  const listOfAllChildren: Array<HTMLElement> = containerRef?.children
-    ? Array.prototype.slice.call(containerRef?.children)
-    : [];
-  const elementsAbleToReceiveFocus = listOfAllChildren.filter(
-    (child) => child.getAttribute("data-no-focus") !== "true"
+  const [activeElement, setActiveElement] = useState<HTMLElement | undefined>(
+    undefined
   );
 
-  const activeElement = elementsAbleToReceiveFocus[index];
+  const getListOfAllChildren = (): Array<HTMLElement> =>
+    containerRef?.children
+      ? Array.prototype.slice.call(containerRef?.children)
+      : [];
+  const getElementsAbleToReceiveFocus = () =>
+    getListOfAllChildren().filter(
+      (child) => child.getAttribute("data-no-focus") !== "true"
+    );
+
   const getElementById = (id: string) =>
-    listOfAllChildren.find((element) => element.id === id);
-  const isFocusOnTheTop = index === 0;
-  const isFocusOnTheBottom = index === elementsAbleToReceiveFocus.length - 1;
+    getListOfAllChildren().find((element) => element.id === id);
+  const isFocusOnTheTop = activeElement
+    ? getElementsAbleToReceiveFocus().indexOf(activeElement) === 0
+    : false;
+  const isFocusOnTheBottom = activeElement
+    ? getElementsAbleToReceiveFocus().indexOf(activeElement) ===
+      getElementsAbleToReceiveFocus().length - 1
+    : false;
 
-  const scrollToOption = (newIndex: number) => {
-    const indexOfElementToScrollTo = Math.min(
-      Math.max(newIndex, 0),
-      containerRef?.children.length || 0
-    );
-    if (containerRef?.children[indexOfElementToScrollTo]) {
-      const child = containerRef.children[indexOfElementToScrollTo];
-      const { top, bottom } = child.getBoundingClientRect();
+  const scrollToOption = (_element?: HTMLElement) => {
+    if (containerRef && _element) {
+      const { top, bottom } = _element.getBoundingClientRect();
       const parentRect = containerRef.getBoundingClientRect();
       if (top < parentRect.top || bottom > parentRect.bottom) {
-        child.scrollIntoView({ block: "nearest" });
+        _element.scrollIntoView({ block: "nearest" });
       }
     }
   };
 
-  const _moveFocusAndScrollTo = (_index: number) => {
-    setIndex(_index);
-    scrollToOption(_index);
+  const _moveFocusAndScrollTo = (_element?: HTMLElement) => {
+    setActiveElement(_element);
+    scrollToOption(_element);
+  };
+
+  const moveFocusUp = () => {
+    if (!activeElement) {
+      return;
+    }
+    const _currentIndex =
+      getElementsAbleToReceiveFocus().indexOf(activeElement);
+    const elementAbove = getElementsAbleToReceiveFocus()[_currentIndex - 1];
+    if (_currentIndex === 0) {
+      setActiveElement(undefined);
+    } else {
+      _moveFocusAndScrollTo(elementAbove);
+    }
   };
-  const moveFocusUp = () => _moveFocusAndScrollTo(Math.max(index - 1, -1));
-  const moveFocusDown = () =>
+
+  const moveFocusDown = () => {
+    if (!activeElement) {
+      _moveFocusAndScrollTo(getElementsAbleToReceiveFocus()[0]);
+      return;
+    }
+    const _currentIndex =
+      getElementsAbleToReceiveFocus().indexOf(activeElement);
+    if (_currentIndex === getElementsAbleToReceiveFocus().length - 1) {
+      return;
+    } else {
+      _moveFocusAndScrollTo(getElementsAbleToReceiveFocus()[_currentIndex + 1]);
+    }
+  };
+
+  const moveFocusToTop = () => _moveFocusAndScrollTo(undefined);
+  const moveFocusToBottom = () =>
     _moveFocusAndScrollTo(
-      Math.min(index + 1, elementsAbleToReceiveFocus.length - 1)
+      getElementsAbleToReceiveFocus()[
+        getElementsAbleToReceiveFocus().length - 1
+      ]
     );
-  const moveFocusToTop = () => _moveFocusAndScrollTo(-1);
-  const moveFocusToBottom = () =>
-    _moveFocusAndScrollTo(elementsAbleToReceiveFocus.length - 1);
   const moveFocusToElement = (id: string) => {
-    const thisElement = elementsAbleToReceiveFocus.find(
-      (_element) => _element.getAttribute("id") === id
+    const _element = getElementsAbleToReceiveFocus().find(
+      (_focusableElement) => _focusableElement.getAttribute("id") === id
     );
-    const indexOfElement = thisElement
-      ? elementsAbleToReceiveFocus.indexOf(thisElement)
-      : -1;
-    if (indexOfElement >= 0) {
-      setIndex(indexOfElement);
+    if (_element) {
+      setActiveElement(_element);
     }
   };
 
@@ -75,7 +102,6 @@ const useVirtualFocus = (
     getElementById,
     isFocusOnTheTop,
     isFocusOnTheBottom,
-    setIndex,
     moveFocusUp,
     moveFocusDown,
     moveFocusToElement,

From 96d4060c3f81f60873ae9e7ea6529133ecf2f28e Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Thu, 23 Nov 2023 15:46:08 +0100
Subject: [PATCH 14/68] make maxSelectedMessage static

---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx     | 2 +-
 .../form/combobox/SelectedOptions/selectedOptionsContext.tsx  | 2 +-
 @navikt/core/react/src/form/combobox/combobox.stories.tsx     | 4 +---
 @navikt/core/react/src/form/combobox/types.ts                 | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 8a37fa765e7..d105b5bd5cc 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -59,7 +59,7 @@ const FilteredOptions = () => {
           data-no-focus="true"
         >
           {maxSelectedMessage && maxSelectedOptions
-            ? maxSelectedMessage(selectedOptions.length, maxSelectedOptions)
+            ? maxSelectedMessage
             : `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
         </li>
       )}
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
index 5482420fd2a..cdab01d7079 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
@@ -19,7 +19,7 @@ type SelectedOptionsContextType = {
   selectedOptions: string[];
   maxSelectedOptions?: number;
   setSelectedOptions: (any) => void;
-  maxSelectedMessage?: (current: number, max: number) => string;
+  maxSelectedMessage?: string;
   toggleOption: (
     option: string,
     event: React.KeyboardEvent | React.PointerEvent
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index ec711e88e22..f3d59b768c7 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -298,9 +298,7 @@ export const MaxSelectedOptions: StoryFunction = () => {
       label="Komboboks med begrenset antall valg"
       options={options}
       maxSelectedOptions={2}
-      maxSelectedMessage={(current, max) =>
-        `${current} av MAKS ${max} er valgt.`
-      }
+      maxSelectedMessage="2 av MAKS 2 er valgt."
       selectedOptions={selectedOptions}
       onToggleSelected={(option, isSelected) =>
         isSelected
diff --git a/@navikt/core/react/src/form/combobox/types.ts b/@navikt/core/react/src/form/combobox/types.ts
index be3d41c3fa5..754ed0ee12e 100644
--- a/@navikt/core/react/src/form/combobox/types.ts
+++ b/@navikt/core/react/src/form/combobox/types.ts
@@ -109,7 +109,7 @@ export interface ComboboxProps
    * @param max - The maximum number of selected options
    * @returns The string / interpolated string to display
    */
-  maxSelectedMessage?: (current: number, max: number) => string;
+  maxSelectedMessage?: string;
   /**
    * Set to "true" to enable inline autocomplete.
    *

From 9b80589f9890ee496990851959d70db7eb6e68b9 Mon Sep 17 00:00:00 2001
From: Lars Eirik Korsgaard Hansen
 <71271458+larseirikhansen@users.noreply.github.com>
Date: Fri, 24 Nov 2023 12:03:43 +0100
Subject: [PATCH 15/68] Remove max-selected:hover

Co-authored-by: Vegard Haugstvedt <it.vegard@gmail.com>
---
 @navikt/core/css/form/combobox.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 8932a337e51..9215c3ab2e3 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -278,10 +278,6 @@
   cursor: default;
 }
 
-.navds-combobox__list-item__max-selected:hover {
-  background-color: unset;
-}
-
 .navds-combobox__list-item--focus,
 .navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));

From ae3ac37906abd72e97150ba346ff1dc8b997539a Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Fri, 24 Nov 2023 12:22:00 +0100
Subject: [PATCH 16/68] yarn lock update

---
 yarn.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 24fad561ed6..016f0f067cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3417,7 +3417,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@navikt/aksel-icons@^5.10.4, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
+"@navikt/aksel-icons@^5.11.1, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
   dependencies:
@@ -3444,8 +3444,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
   dependencies:
-    "@navikt/ds-css": ^5.10.4
-    "@navikt/ds-tokens": ^5.10.4
+    "@navikt/ds-css": ^5.11.1
+    "@navikt/ds-tokens": ^5.11.1
     "@types/jest": ^29.0.0
     concurrently: 7.2.1
     copyfiles: 2.4.1
@@ -3463,7 +3463,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel@workspace:@navikt/aksel"
   dependencies:
-    "@navikt/ds-css": 5.10.4
+    "@navikt/ds-css": 5.11.1
     "@types/inquirer": ^9.0.3
     "@types/jest": ^29.0.0
     axios: 1.6.0
@@ -3487,11 +3487,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-css@*, @navikt/ds-css@5.10.4, @navikt/ds-css@^5.10.4, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
+"@navikt/ds-css@*, @navikt/ds-css@5.11.1, @navikt/ds-css@^5.11.1, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-css@workspace:@navikt/core/css"
   dependencies:
-    "@navikt/ds-tokens": ^5.10.4
+    "@navikt/ds-tokens": ^5.11.1
     cssnano: 6.0.0
     fast-glob: 3.2.11
     lodash: 4.17.21
@@ -3504,13 +3504,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-react@*, @navikt/ds-react@^5.10.4, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
+"@navikt/ds-react@*, @navikt/ds-react@^5.11.1, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-react@workspace:@navikt/core/react"
   dependencies:
     "@floating-ui/react": 0.25.4
-    "@navikt/aksel-icons": ^5.10.4
-    "@navikt/ds-tokens": ^5.10.4
+    "@navikt/aksel-icons": ^5.11.1
+    "@navikt/ds-tokens": ^5.11.1
     "@radix-ui/react-tabs": 1.0.0
     "@radix-ui/react-toggle-group": 1.0.0
     "@testing-library/dom": 8.13.0
@@ -3544,11 +3544,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tailwind@^5.10.4, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
+"@navikt/ds-tailwind@^5.11.1, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
   dependencies:
-    "@navikt/ds-tokens": ^5.10.4
+    "@navikt/ds-tokens": ^5.11.1
     "@types/jest": ^29.0.0
     color: 4.2.3
     jest: ^29.0.0
@@ -3560,7 +3560,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tokens@^5.10.4, @navikt/ds-tokens@workspace:@navikt/core/tokens":
+"@navikt/ds-tokens@^5.11.1, @navikt/ds-tokens@workspace:@navikt/core/tokens":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
   dependencies:
@@ -8812,11 +8812,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "aksel.nav.no@workspace:aksel.nav.no"
   dependencies:
-    "@navikt/aksel-icons": ^5.10.4
-    "@navikt/ds-css": ^5.10.4
-    "@navikt/ds-react": ^5.10.4
-    "@navikt/ds-tailwind": ^5.10.4
-    "@navikt/ds-tokens": ^5.10.4
+    "@navikt/aksel-icons": ^5.11.1
+    "@navikt/ds-css": ^5.11.1
+    "@navikt/ds-react": ^5.11.1
+    "@navikt/ds-tailwind": ^5.11.1
+    "@navikt/ds-tokens": ^5.11.1
     prettier-plugin-tailwindcss: ^0.2.3
   languageName: unknown
   linkType: soft

From ac45c843e731b9a058a3f25e17932deaada1d58b Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Fri, 24 Nov 2023 12:24:29 +0100
Subject: [PATCH 17/68] 'cursor: not allowed' only hits disabled options

---
 @navikt/core/css/form/combobox.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 9215c3ab2e3..5ad915d8df6 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -295,7 +295,11 @@
   background: var(--a-surface-neutral-subtle);
 }
 
-.navds-combobox__list-item:not(.navds-combobox__list-item__max-selected)[data-no-focus="true"] {
+.navds-combobox__list-item:not(
+    .navds-combobox__list-item__max-selected,
+    .navds-combobox__list-item__loading,
+    .navds-combobox__list-item__no-options
+  )[data-no-focus="true"] {
   cursor: not-allowed;
   opacity: 0.4;
 }

From 25c23ea15b70f8f7ac723d9324a220d397df2dec Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Fri, 24 Nov 2023 13:46:30 +0100
Subject: [PATCH 18/68] remove li-margins, add ul-gap with negative margin on
 max-selected-option

---
 @navikt/core/css/form/combobox.css | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 5ad915d8df6..30fa6f1d42d 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -217,18 +217,7 @@
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
   color: var(--ac-combobox-list-text, var(--a-text-default));
-}
-
-.navds-combobox__list :where(li) {
-  margin: var(--a-spacing-05) 0;
-}
-
-.navds-combobox__list :where(li:first-child) {
-  margin: 0 0 var(--a-spacing-05);
-}
-
-.navds-combobox__list :where(li:last-child) {
-  margin: var(--a-spacing-05) 0 0;
+  gap: var(--a-spacing-1) 0;
 }
 
 .navds-combobox__list--closed {
@@ -265,7 +254,7 @@
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
   border-radius: 3px 3px 0 0;
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
-  margin-bottom: 0;
+  margin-bottom: calc(var(--a-spacing-1) * -1);
 }
 
 .navds-combobox__list-item__max-selected + li {

From 6fd3c2348e9b9b6072494b07dbff4a5a3afce21a Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Mon, 27 Nov 2023 10:08:39 +0100
Subject: [PATCH 19/68] remove 'a' from initialstate maxSelectedOptions Story

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index f3d59b768c7..c316f15e619 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -287,7 +287,7 @@ export const ComboboxSizes = () => (
 
 export const MaxSelectedOptions: StoryFunction = () => {
   const id = useId();
-  const [value, setValue] = useState<string | undefined>("a");
+  const [value, setValue] = useState<string | undefined>("");
   const [selectedOptions, setSelectedOptions] = useState([
     options[0],
     options[1],

From a2cadc1578b6f142d2edc0b92c828a542b5d821e Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 10:30:49 +0100
Subject: [PATCH 20/68] Update @navikt/core/css/form/combobox.css

---
 @navikt/core/css/form/combobox.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 30fa6f1d42d..27fb5794b31 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -252,7 +252,7 @@
 
 .navds-combobox__list-item__max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
-  border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0; /* TODO: Change to default 4px border-radius when we refactor styling of dropdown */
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }

From c836b86881cda9a056fa370c6f4ddf22eb1e7838 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 10:35:46 +0100
Subject: [PATCH 21/68] Update @navikt/core/css/form/combobox.css

---
 @navikt/core/css/form/combobox.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 27fb5794b31..f19ac8edbce 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -280,10 +280,6 @@
   padding-left: calc(var(--a-spacing-2) - 4px);
 }
 
-.navds-combobox__list-item:has(.navds-combobox__list-item__new-option)[data-no-focus="true"] {
-  background: var(--a-surface-neutral-subtle);
-}
-
 .navds-combobox__list-item:not(
     .navds-combobox__list-item__max-selected,
     .navds-combobox__list-item__loading,

From 58bf4e9a2cb3ca6ea390ee97519ba14fd0c8f72f Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 10:53:21 +0100
Subject: [PATCH 22/68] Update
 @navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx

---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index d105b5bd5cc..4e0a4b2a1e0 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -58,9 +58,7 @@ const FilteredOptions = () => {
           id={`${id}-max-selected`}
           data-no-focus="true"
         >
-          {maxSelectedMessage && maxSelectedOptions
-            ? maxSelectedMessage
-            : `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
+          {maxSelectedMessage ?? `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
         </li>
       )}
       {isLoading && (

From aa64a1198cacead376e5377da64659e98daeef44 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 11:18:22 +0100
Subject: [PATCH 23/68] Update
 @navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts

---
 .../react/src/form/combobox/FilteredOptions/useVirtualFocus.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index 670860b4b74..6b4ca8b3960 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -21,7 +21,7 @@ const useVirtualFocus = (
 
   const getListOfAllChildren = (): Array<HTMLElement> =>
     containerRef?.children
-      ? Array.prototype.slice.call(containerRef?.children)
+      ? Array.from(containerRef?.children)
       : [];
   const getElementsAbleToReceiveFocus = () =>
     getListOfAllChildren().filter(

From 7ad1c7ab09d20fef674e38f4364ac6ccb33da0f6 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 11:22:04 +0100
Subject: [PATCH 24/68] Update
 @navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts

---
 .../src/form/combobox/FilteredOptions/useVirtualFocus.ts      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index 6b4ca8b3960..e24ee3b5fb4 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -20,9 +20,7 @@ const useVirtualFocus = (
   );
 
   const getListOfAllChildren = (): Array<HTMLElement> =>
-    containerRef?.children
-      ? Array.from(containerRef?.children)
-      : [];
+    Array.from(containerRef?.children ?? [])
   const getElementsAbleToReceiveFocus = () =>
     getListOfAllChildren().filter(
       (child) => child.getAttribute("data-no-focus") !== "true"

From b8c540bd063295663f0aace61a0232fab457724c Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 27 Nov 2023 11:35:33 +0100
Subject: [PATCH 25/68] Update
 @navikt/core/react/src/form/combobox/combobox.stories.tsx

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index c316f15e619..e5d8173a843 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -298,7 +298,6 @@ export const MaxSelectedOptions: StoryFunction = () => {
       label="Komboboks med begrenset antall valg"
       options={options}
       maxSelectedOptions={2}
-      maxSelectedMessage="2 av MAKS 2 er valgt."
       selectedOptions={selectedOptions}
       onToggleSelected={(option, isSelected) =>
         isSelected

From f81f72b25f9e1845aaa7c1e628ae4c9540ee4aaf Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Mon, 27 Nov 2023 11:39:23 +0100
Subject: [PATCH 26/68] type assertion

---
 .../react/src/form/combobox/FilteredOptions/useVirtualFocus.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index e24ee3b5fb4..2d21ebc24b7 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -20,7 +20,7 @@ const useVirtualFocus = (
   );
 
   const getListOfAllChildren = (): Array<HTMLElement> =>
-    Array.from(containerRef?.children ?? [])
+    Array.from(containerRef?.children ?? []) as Array<HTMLElement>;
   const getElementsAbleToReceiveFocus = () =>
     getListOfAllChildren().filter(
       (child) => child.getAttribute("data-no-focus") !== "true"

From 88ec80df5b009ea4e3b66e2d1ea278cb320e3ae9 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Fri, 1 Dec 2023 11:48:04 +0100
Subject: [PATCH 27/68] remove tab-index on wrapper div

---
 @navikt/core/css/form/combobox.css                       | 5 +++++
 @navikt/core/react/src/form/combobox/ComboboxWrapper.tsx | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index f19ac8edbce..15ad1f2ee6c 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -1,3 +1,8 @@
+.navds-combobox-form-field {
+  display: flex;
+  flex-direction: column;
+}
+
 .navds-combobox__wrapper {
   display: flex;
   flex-direction: column;
diff --git a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
index 6bfe1f8516d..31aa2b8c3ec 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
@@ -47,7 +47,7 @@ const ComboboxWrapper = ({
       ref={wrapperRef}
       className={cl(
         className,
-        "navds-form-field",
+        "navds-combobox-form-field",
         `navds-form-field--${inputSize}`,
         {
           "navds-combobox--error": hasError,
@@ -57,7 +57,6 @@ const ComboboxWrapper = ({
       )}
       onFocus={onFocusInsideWrapper}
       onBlur={onBlurWrapper}
-      tabIndex={-1}
     >
       {children}
     </div>

From 434ad60f0bb08c21ccdeaec15e33a3474d5ede1b Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 6 Dec 2023 15:26:46 +0100
Subject: [PATCH 28/68] prototype for sticky non-selectable options

---
 @navikt/core/css/form/combobox.css            |  43 +++-
 .../FilteredOptions/FilteredOptions.tsx       | 238 +++++++++---------
 .../src/form/combobox/combobox.stories.tsx    |  11 +-
 3 files changed, 166 insertions(+), 126 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 15ad1f2ee6c..a2a3b7d070e 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -77,7 +77,6 @@
 }
 
 .navds-combobox__input {
-  z-index: 1;
   flex: 1;
   border: none;
   padding: 0;
@@ -201,7 +200,7 @@
   height: 1.25rem;
 }
 
-/* dropdown list */
+/* dropdown & non selectable dropdown items */
 
 .navds-combobox__list {
   max-height: 290px;
@@ -209,15 +208,11 @@
   position: absolute;
   left: 0;
   right: 0;
-  z-index: 9999;
+  z-index: var(--a-z-index-popover);
   top: calc(100% + var(--a-spacing-2));
-  list-style: none;
-  margin: 0;
   border: 1px solid var(--ac-combobox-list-border-color, var(--a-border-divider));
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
-  padding: 0;
   box-shadow: var(--a-shadow-small);
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
@@ -234,11 +229,21 @@
   width: 1.5rem;
 }
 
+.navds-combobox__list_non-selectables {
+  position: sticky;
+  top: 0;
+  left: 0;
+  right: 0;
+  gap: inherit;
+  background-color: inherit;
+  display: inherit;
+  flex-direction: inherit;
+}
+
 .navds-combobox__list-item {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  align-items: center;
   padding: var(--a-spacing-3);
   width: 100%;
   background-color: var(--ac-combobox-list-item-bg, var(--a-surface-default));
@@ -272,6 +277,28 @@
   cursor: default;
 }
 
+/* ul-list and selectable li-items */
+
+.navds-combobox__list-options {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  display: inherit;
+  flex-direction: inherit;
+  gap: inherit;
+  background-color: inherit;
+  align-items: flex-start;
+}
+
+/* 
+.navds-combobox__list {
+  overflow-y: auto;
+  border: 1px solid var(--ac-combobox-list-border-color, var(--a-border-divider));
+  box-shadow: var(--a-shadow-small);
+}
+*/
+
 .navds-combobox__list-item--focus,
 .navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 4e0a4b2a1e0..abb890c9720 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -1,12 +1,12 @@
-import React from "react";
 import cl from "clsx";
+import React from "react";
 import { CheckmarkIcon, PlusIcon } from "@navikt/aksel-icons";
-import { useFilteredOptionsContext } from "./filteredOptionsContext";
-import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
-import { useInputContext } from "../Input/inputContext";
 import { Loader } from "../../../loader";
 import { BodyShort, Label } from "../../../typography";
+import { useInputContext } from "../Input/inputContext";
+import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import filteredOptionsUtil from "./filtered-options-util";
+import { useFilteredOptionsContext } from "./filteredOptionsContext";
 
 const FilteredOptions = () => {
   const {
@@ -40,125 +40,133 @@ const FilteredOptions = () => {
     !canSelectMoreOptions && !selectedOptions.includes(option);
 
   return (
-    <ul
-      ref={setFilteredOptionsRef}
+    <div
       className={cl("navds-combobox__list", {
         "navds-combobox__list--closed": !isListOpen,
         "navds-combobox__list--with-hover": isMouseLastUsedInputDevice,
       })}
       id={filteredOptionsUtil.getFilteredOptionsId(id)}
-      role="listbox"
       tabIndex={-1}
     >
-      {!canSelectMoreOptions && (
-        <li
-          className="navds-combobox__list-item navds-combobox__list-item__max-selected"
-          role="option"
-          aria-selected={false}
-          id={`${id}-max-selected`}
-          data-no-focus="true"
-        >
-          {maxSelectedMessage ?? `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
-        </li>
-      )}
-      {isLoading && (
-        <li
-          className="navds-combobox__list-item navds-combobox__list-item__loading"
-          role="option"
-          aria-selected={false}
-          id={filteredOptionsUtil.getIsLoadingId(id)}
-          data-no-focus="true"
-        >
-          <Loader aria-label="Søker..." />
-        </li>
-      )}
-      {isValueNew && canSelectMoreOptions && allowNewValues && (
-        <li
-          tabIndex={-1}
-          onMouseMove={() => {
-            if (
-              activeDecendantId !== filteredOptionsUtil.getAddNewOptionId(id)
-            ) {
-              virtualFocus.moveFocusToElement(
-                filteredOptionsUtil.getAddNewOptionId(id)
-              );
-              setIsMouseLastUsedInputDevice(true);
-            }
-          }}
-          onPointerUp={(event) => {
-            toggleOption(value, event);
-            if (!isMultiSelect && !selectedOptions.includes(value))
-              toggleIsListOpen(false);
-          }}
-          id={filteredOptionsUtil.getAddNewOptionId(id)}
-          className={cl(
-            "navds-combobox__list-item navds-combobox__list-item__new-option",
-            {
-              "navds-combobox__list-item__new-option--focus":
-                activeDecendantId === filteredOptionsUtil.getAddNewOptionId(id),
-            }
-          )}
-          role="option"
-          aria-selected={false}
-        >
-          <PlusIcon aria-hidden />
-          <BodyShort size={size}>
-            Legg til{" "}
-            <Label as="span" size={size}>
-              &#8220;{value}&#8221;
-            </Label>
-          </BodyShort>
-        </li>
-      )}
-      {!isLoading && filteredOptions.length === 0 && (
-        <li
-          className="navds-combobox__list-item navds-combobox__list-item__no-options"
-          role="option"
-          aria-selected={false}
-          id={filteredOptionsUtil.getNoHitsId(id)}
-          data-no-focus="true"
-        >
-          Ingen søketreff
-        </li>
-      )}
-      {filteredOptions.map((option) => (
-        <li
-          className={cl("navds-combobox__list-item", {
-            "navds-combobox__list-item--focus":
-              activeDecendantId === filteredOptionsUtil.getOptionId(id, option),
-            "navds-combobox__list-item--selected":
-              selectedOptions.includes(option),
-          })}
-          data-no-focus={isDisabled(option) || undefined}
-          id={filteredOptionsUtil.getOptionId(id, option)}
-          key={option}
-          tabIndex={-1}
-          onMouseMove={() => {
-            if (
-              activeDecendantId !== filteredOptionsUtil.getOptionId(id, option)
-            ) {
-              virtualFocus.moveFocusToElement(
+      <div className="navds-combobox__list_non-selectables">
+        {!canSelectMoreOptions && (
+          <div
+            className="sticky navds-combobox__list-item navds-combobox__list-item__max-selected"
+            aria-selected={false}
+            id={`${id}-max-selected`}
+            data-no-focus="true"
+          >
+            {maxSelectedMessage ??
+              `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
+          </div>
+        )}
+        {isLoading && (
+          <div
+            className="sticky navds-combobox__list-item navds-combobox__list-item__loading"
+            aria-selected={false}
+            id={filteredOptionsUtil.getIsLoadingId(id)}
+            data-no-focus="true"
+          >
+            <Loader aria-label="Søker..." />
+          </div>
+        )}
+        {!isLoading && filteredOptions.length === 0 && (
+          <div
+            className="sticky navds-combobox__list-item navds-combobox__list-item__no-options"
+            aria-selected={false}
+            id={filteredOptionsUtil.getNoHitsId(id)}
+            data-no-focus="true"
+          >
+            Ingen søketreff
+          </div>
+        )}
+      </div>
+
+      <ul
+        ref={setFilteredOptionsRef}
+        role="listbox"
+        className="navds-combobox__list-options"
+      >
+        {isValueNew && canSelectMoreOptions && allowNewValues && (
+          <li
+            tabIndex={-1}
+            onMouseMove={() => {
+              if (
+                activeDecendantId !== filteredOptionsUtil.getAddNewOptionId(id)
+              ) {
+                virtualFocus.moveFocusToElement(
+                  filteredOptionsUtil.getAddNewOptionId(id)
+                );
+                setIsMouseLastUsedInputDevice(true);
+              }
+            }}
+            onPointerUp={(event) => {
+              toggleOption(value, event);
+              if (!isMultiSelect && !selectedOptions.includes(value))
+                toggleIsListOpen(false);
+            }}
+            id={filteredOptionsUtil.getAddNewOptionId(id)}
+            className={cl(
+              "navds-combobox__list-item navds-combobox__list-item__new-option",
+              {
+                "navds-combobox__list-item__new-option--focus":
+                  activeDecendantId ===
+                  filteredOptionsUtil.getAddNewOptionId(id),
+              }
+            )}
+            role="option"
+            aria-selected={false}
+          >
+            <PlusIcon aria-hidden />
+            <BodyShort size={size}>
+              Legg til{" "}
+              <Label as="span" size={size}>
+                &#8220;{value}&#8221;
+              </Label>
+            </BodyShort>
+          </li>
+        )}
+        {filteredOptions.map((option) => (
+          <li
+            className={cl("navds-combobox__list-item", {
+              "navds-combobox__list-item--focus":
+                activeDecendantId ===
+                filteredOptionsUtil.getOptionId(id, option),
+              "navds-combobox__list-item--selected":
+                selectedOptions.includes(option),
+            })}
+            data-no-focus={isDisabled(option) || undefined}
+            id={filteredOptionsUtil.getOptionId(id, option)}
+            key={option}
+            tabIndex={-1}
+            onMouseMove={() => {
+              if (
+                activeDecendantId !==
                 filteredOptionsUtil.getOptionId(id, option)
-              );
-              setIsMouseLastUsedInputDevice(true);
-            }
-          }}
-          onPointerUp={(event) => {
-            if (isDisabled(option)) {
-              return;
-            }
-            toggleOption(option, event);
-            if (!isMultiSelect && !selectedOptions.includes(option))
-              toggleIsListOpen(false);
-          }}
-          role="option"
-          aria-selected={selectedOptions.includes(option)}
-        >
-          <BodyShort size={size}>{option}</BodyShort>
-          {selectedOptions.includes(option) && <CheckmarkIcon />}
-        </li>
-      ))}
-    </ul>
+              ) {
+                virtualFocus.moveFocusToElement(
+                  filteredOptionsUtil.getOptionId(id, option)
+                );
+                setIsMouseLastUsedInputDevice(true);
+              }
+            }}
+            onPointerUp={(event) => {
+              if (isDisabled(option)) {
+                return;
+              }
+              toggleOption(option, event);
+              if (!isMultiSelect && !selectedOptions.includes(option))
+                toggleIsListOpen(false);
+            }}
+            role="option"
+            aria-selected={selectedOptions.includes(option)}
+          >
+            <BodyShort size={size}>{option}</BodyShort>
+            {selectedOptions.includes(option) && <CheckmarkIcon />}
+          </li>
+        ))}
+      </ul>
+    </div>
   );
 };
 
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index e5d8173a843..9ee779ff7e4 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -1,8 +1,8 @@
+import { expect, jest } from "@storybook/jest";
 import { Meta, StoryFn, StoryObj } from "@storybook/react";
-import React, { useState, useId, useMemo } from "react";
 import { userEvent, within } from "@storybook/testing-library";
-import { Chips, UNSAFE_Combobox, ComboboxProps, TextField } from "../../index";
-import { expect, jest } from "@storybook/jest";
+import React, { useId, useMemo, useState } from "react";
+import { Chips, ComboboxProps, TextField, UNSAFE_Combobox } from "../../index";
 
 export default {
   title: "ds-react/Combobox",
@@ -38,11 +38,16 @@ Default.args = {
   label: "Hva er dine favorittfrukter?",
   shouldAutocomplete: true,
   isLoading: false,
+  isMultiSelect: false,
+  allowNewValues: false,
 };
 Default.argTypes = {
   isListOpen: {
     control: { type: "boolean" },
   },
+  maxSelectedOptions: {
+    control: { type: "number" },
+  },
   size: {
     options: ["medium", "small"],
     defaultValue: "medium",

From 5e6a2f6b7e6f9ba57ac7d3c7b54af9a323fbd726 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Mon, 18 Dec 2023 09:08:17 +0100
Subject: [PATCH 29/68] "yarn lock"

---
 yarn.lock | 2874 +----------------------------------------------------
 1 file changed, 3 insertions(+), 2871 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index adff71268c2..c0db0b87c08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13,15 +13,9 @@ __metadata:
   linkType: hard
 
 "@adobe/css-tools@npm:^4.0.1, @adobe/css-tools@npm:^4.3.1":
-<<<<<<< HEAD
-  version: 4.3.1
-  resolution: "@adobe/css-tools@npm:4.3.1"
-  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
-=======
   version: 4.3.2
   resolution: "@adobe/css-tools@npm:4.3.2"
   checksum: 9667d61d55dc3b0a315c530ae84e016ce5267c4dd8ac00abb40108dc98e07b98e3090ce8b87acd51a41a68d9e84dcccb08cdf21c902572a9cf9dcaf830da4ae3
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -33,30 +27,6 @@ __metadata:
   linkType: hard
 
 "@amplitude/analytics-browser@npm:^2.2.3":
-<<<<<<< HEAD
-  version: 2.3.3
-  resolution: "@amplitude/analytics-browser@npm:2.3.3"
-  dependencies:
-    "@amplitude/analytics-client-common": ^2.0.7
-    "@amplitude/analytics-core": ^2.1.0
-    "@amplitude/analytics-types": ^2.3.0
-    "@amplitude/plugin-page-view-tracking-browser": ^2.0.13
-    "@amplitude/plugin-web-attribution-browser": ^2.0.13
-    tslib: ^2.4.1
-  checksum: 208e3d66313871e4250e37797214a7019483d416645f56b23483d39903824099bb2e29da28401695a7169e3c43c5858e1263c571d9eb09628a59d7dd8186163e
-  languageName: node
-  linkType: hard
-
-"@amplitude/analytics-client-common@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "@amplitude/analytics-client-common@npm:2.0.7"
-  dependencies:
-    "@amplitude/analytics-connector": ^1.4.8
-    "@amplitude/analytics-core": ^2.1.0
-    "@amplitude/analytics-types": ^2.3.0
-    tslib: ^2.4.1
-  checksum: 865c2ad52436b660b742b089d9b736fd122da3bcab7a985b77f943683bde9e11737c33540514dbf462f600149f214e06977733c0b08779320bc310ef96a69058
-=======
   version: 2.3.6
   resolution: "@amplitude/analytics-browser@npm:2.3.6"
   dependencies:
@@ -79,7 +49,6 @@ __metadata:
     "@amplitude/analytics-types": ^2.3.1
     tslib: ^2.4.1
   checksum: a4afbaec1d25bc9cb4e0185724a73405a009dd1ef5e419350a81f426e271590e9d34b673f7ba920f140f18b8e5f76ae758f6305a555a929171c99908a52d45e6
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -90,45 +59,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@amplitude/analytics-core@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@amplitude/analytics-core@npm:2.1.0"
-  dependencies:
-    "@amplitude/analytics-types": ^2.3.0
-    tslib: ^2.4.1
-  checksum: 5e19a0b1160b9295084cb638f5696feee627bc1d4cb9e97b368aedcf470df033e55bd0772ab8f96bcc1fabf6bf999e59633447c8c77d2dd6cdc0b8ec671b2767
-  languageName: node
-  linkType: hard
-
-"@amplitude/analytics-types@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "@amplitude/analytics-types@npm:2.3.0"
-  checksum: 9618f249884195c811a50b16001aea400ab1de24922cd4156a0d6551cb1218460aae7f46391f04b7c5b25a40556b26a67c8aedcea9d2e984d801358f1e0415fa
-  languageName: node
-  linkType: hard
-
-"@amplitude/plugin-page-view-tracking-browser@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "@amplitude/plugin-page-view-tracking-browser@npm:2.0.13"
-  dependencies:
-    "@amplitude/analytics-client-common": ^2.0.7
-    "@amplitude/analytics-types": ^2.3.0
-    tslib: ^2.4.1
-  checksum: c1dd5331b53c7905636d63dd66e0e8e7b7699c434c18cf614a223740a45dca96d0aba3b6fe1c1d7786d18f0a5971f8fe278a999d53cca482722a965306db38ca
-  languageName: node
-  linkType: hard
-
-"@amplitude/plugin-web-attribution-browser@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "@amplitude/plugin-web-attribution-browser@npm:2.0.13"
-  dependencies:
-    "@amplitude/analytics-client-common": ^2.0.7
-    "@amplitude/analytics-core": ^2.1.0
-    "@amplitude/analytics-types": ^2.3.0
-    tslib: ^2.4.1
-  checksum: 968a640f4424359715918544a3105e01863c952274549220dace281e0986433914799c228f61d587f41b16da346a4b47a3dcb9693899910644b750f16ee02c65
-=======
 "@amplitude/analytics-core@npm:^2.1.2":
   version: 2.1.2
   resolution: "@amplitude/analytics-core@npm:2.1.2"
@@ -166,7 +96,6 @@ __metadata:
     "@amplitude/analytics-types": ^2.3.1
     tslib: ^2.4.1
   checksum: ddeb9fe41ef60c0060e9dac48c73f14c0d3ceb858c29e26ab7a6ba8ed994ec43d0898ee5adcf184b6e3f3ad4addf0583105c6ff74214b36c6cddeee8e8f59dce
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -192,33 +121,19 @@ __metadata:
   linkType: hard
 
 "@axe-core/playwright@npm:^4.5.2":
-<<<<<<< HEAD
-  version: 4.8.1
-  resolution: "@axe-core/playwright@npm:4.8.1"
-=======
   version: 4.8.2
   resolution: "@axe-core/playwright@npm:4.8.2"
->>>>>>> origin/main
   dependencies:
     axe-core: ~4.8.2
   peerDependencies:
     playwright-core: ">= 1.0.0"
-<<<<<<< HEAD
-  checksum: 08f34f6a6f106aafafab4d6bda8f7c273c9785811410cc42c0713bc469bb302d137b8b7a8ce09645525b2f18b6b59eddf80cbbb2cffc364b2b141779958cfffe
-=======
   checksum: 1a292b7b2a4f0b57a0e2227e7fe4cf59a6161d449fc5788b9129adc9162f905e902f54e3375ee9ea956a5d156fc0a178bfd783b32e5c43fa16010d465c4a6b4c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/cli@npm:^7.19.3":
-<<<<<<< HEAD
-  version: 7.23.0
-  resolution: "@babel/cli@npm:7.23.0"
-=======
   version: 7.23.4
   resolution: "@babel/cli@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@jridgewell/trace-mapping": ^0.3.17
     "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3
@@ -239,43 +154,6 @@ __metadata:
   bin:
     babel: ./bin/babel.js
     babel-external-helpers: ./bin/babel-external-helpers.js
-<<<<<<< HEAD
-  checksum: beeb189560bf9c4ea951ef637eefa5214654678fb09c4aaa6695921037059c1e1553c610fe95fbd19a9cdfd9f5598a812fc13df40a6b9a9ea899e43fc6c42052
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.22.13":
-  version: 7.22.13
-  resolution: "@babel/code-frame@npm:7.22.13"
-  dependencies:
-    "@babel/highlight": ^7.22.13
-    chalk: ^2.4.2
-  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/compat-data@npm:7.23.2"
-  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
-  languageName: node
-  linkType: hard
-
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.18.9, @babel/core@npm:^7.19.0, @babel/core@npm:^7.19.6, @babel/core@npm:^7.20.12, @babel/core@npm:^7.20.5, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/core@npm:7.23.2"
-  dependencies:
-    "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.22.13
-    "@babel/generator": ^7.23.0
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-module-transforms": ^7.23.0
-    "@babel/helpers": ^7.23.2
-    "@babel/parser": ^7.23.0
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.2
-    "@babel/types": ^7.23.0
-=======
   checksum: 5a4f296cdf0b15a8578a860ad42675a358d888e11088c91ee5e510b48598d1dd88d83686d6fe6744c0a9cbcddfd34e79bc75ea425ced8ec9a2531e08c2655279
   languageName: node
   linkType: hard
@@ -311,17 +189,12 @@ __metadata:
     "@babel/template": ^7.22.15
     "@babel/traverse": ^7.23.5
     "@babel/types": ^7.23.5
->>>>>>> origin/main
     convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.3
     semver: ^6.3.1
-<<<<<<< HEAD
-  checksum: 003897718ded16f3b75632d63cd49486bf67ff206cc7ebd1a10d49e2456f8d45740910d5ec7e42e3faf0deec7a2e96b1a02e766d19a67a8309053f0d4e57c0fe
-=======
   checksum: 5e5dfb1e61f298676f1fca18c646dbf6fb164ca1056b0169b8d42b7f5c35e026d81823582ccb2358e93a61b035e22b3ad37e2abaae4bf43f1ffb93b6ce19466e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -336,17 +209,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.7.2":
-  version: 7.23.0
-  resolution: "@babel/generator@npm:7.23.0"
-  dependencies:
-    "@babel/types": ^7.23.0
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
-    jsesc: ^2.5.1
-  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
-=======
 "@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.5, @babel/generator@npm:^7.7.2":
   version: 7.23.5
   resolution: "@babel/generator@npm:7.23.5"
@@ -356,7 +218,6 @@ __metadata:
     "@jridgewell/trace-mapping": ^0.3.17
     jsesc: ^2.5.1
   checksum: 845ddda7cf38a3edf4be221cc8a439dee9ea6031355146a1a74047aa8007bc030305b27d8c68ec9e311722c910610bde38c0e13a9ce55225251e7cb7e7f3edc8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -369,11 +230,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
-=======
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
->>>>>>> origin/main
   version: 7.22.15
   resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
   dependencies:
@@ -382,11 +239,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
-=======
 "@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6":
->>>>>>> origin/main
   version: 7.22.15
   resolution: "@babel/helper-compilation-targets@npm:7.22.15"
   dependencies:
@@ -399,18 +252,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/helper-member-expression-to-functions": ^7.22.15
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.9
-=======
 "@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-create-class-features-plugin@npm:7.23.5"
@@ -421,25 +262,16 @@ __metadata:
     "@babel/helper-member-expression-to-functions": ^7.23.0
     "@babel/helper-optimise-call-expression": ^7.22.5
     "@babel/helper-replace-supers": ^7.22.20
->>>>>>> origin/main
     "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
     "@babel/helper-split-export-declaration": ^7.22.6
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-<<<<<<< HEAD
-  checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-=======
   checksum: fe7c6c0baca1838bba76ac1330df47b661d932354115ea9e2ea65b179f80b717987d3c3da7e1525fd648e5f2d86c620efc959cabda4d7562b125a27c3ac780d0
   languageName: node
   linkType: hard
 
 "@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
->>>>>>> origin/main
   version: 7.22.15
   resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
   dependencies:
@@ -467,11 +299,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
-=======
 "@babel/helper-environment-visitor@npm:^7.22.20":
->>>>>>> origin/main
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
   checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
@@ -497,11 +325,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-member-expression-to-functions@npm:^7.22.15":
-=======
 "@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.23.0":
->>>>>>> origin/main
   version: 7.23.0
   resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
   dependencies:
@@ -510,11 +334,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
-=======
 "@babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15":
->>>>>>> origin/main
   version: 7.22.15
   resolution: "@babel/helper-module-imports@npm:7.22.15"
   dependencies:
@@ -523,15 +343,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-module-transforms@npm:7.23.0"
-=======
 "@babel/helper-module-transforms@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/helper-module-transforms@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-environment-visitor": ^7.22.20
     "@babel/helper-module-imports": ^7.22.15
@@ -540,11 +354,7 @@ __metadata:
     "@babel/helper-validator-identifier": ^7.22.20
   peerDependencies:
     "@babel/core": ^7.0.0
-<<<<<<< HEAD
-  checksum: 6e2afffb058cf3f8ce92f5116f710dda4341c81cfcd872f9a0197ea594f7ce0ab3cb940b0590af2fe99e60d2e5448bfba6bca8156ed70a2ed4be2adc8586c891
-=======
   checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -564,11 +374,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5":
-=======
 "@babel/helper-remap-async-to-generator@npm:^7.22.20":
->>>>>>> origin/main
   version: 7.22.20
   resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
   dependencies:
@@ -581,11 +387,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
-=======
 "@babel/helper-replace-supers@npm:^7.22.20":
->>>>>>> origin/main
   version: 7.22.20
   resolution: "@babel/helper-replace-supers@npm:7.22.20"
   dependencies:
@@ -625,16 +427,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-string-parser@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-string-parser@npm:7.22.5"
-  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> origin/main
 "@babel/helper-string-parser@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/helper-string-parser@npm:7.23.4"
@@ -649,17 +441,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helper-validator-option@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-validator-option@npm:7.22.15"
-  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
-=======
 "@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
   checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -674,22 +459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/helpers@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/helpers@npm:7.23.2"
-  dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/traverse": ^7.23.2
-    "@babel/types": ^7.23.0
-  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
-  languageName: node
-  linkType: hard
-
-"@babel/highlight@npm:^7.22.13":
-  version: 7.22.20
-  resolution: "@babel/highlight@npm:7.22.20"
-=======
 "@babel/helpers@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helpers@npm:7.23.5"
@@ -704,33 +473,15 @@ __metadata:
 "@babel/highlight@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/highlight@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-validator-identifier": ^7.22.20
     chalk: ^2.4.2
     js-tokens: ^4.0.0
-<<<<<<< HEAD
-  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/parser@npm:7.23.0"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.20.5":
-=======
   checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
   languageName: node
   linkType: hard
 
 "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.5":
->>>>>>> origin/main
   version: 7.23.5
   resolution: "@babel/parser@npm:7.23.5"
   bin:
@@ -739,35 +490,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
-=======
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0
-<<<<<<< HEAD
-  checksum: 8910ca21a7ec7c06f7b247d4b86c97c5aa15ef321518f44f6f490c5912fdf82c605aaa02b90892e375d82ccbedeadfdeadd922c1b836c9dd4c596871bf654753
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.22.15
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: fbefedc0da014c37f1a50a8094ce7dbbf2181ae93243f23d6ecba2499b5b20196c2124d6a4dfe3e9e0125798e80593103e456352a4beb4e5c6f7c75efb80fdac
-=======
   checksum: ddbaf2c396b7780f15e80ee01d6dd790db076985f3dfeb6527d1a8d4cacf370e49250396a3aa005b2c40233cac214a106232f83703d5e8491848bde273938232
   languageName: node
   linkType: hard
@@ -794,7 +523,6 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0
   checksum: 4690123f0ef7c11d6bf1a9579e4f463ce363563b75ec3f6ca66cf68687e39d8d747a82c833847653962f79da367eca895d9095c60d8ebb224a1d4277003acc11
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -873,28 +601,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-syntax-flow@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-flow@npm:7.22.5"
-=======
 "@babel/plugin-syntax-flow@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-syntax-flow@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 84c8c40fcfe8e78cecdd6fb90e8f97f419e3f3b27a33de8324ae97d5ce1b87cdd98a636fa21a68d4d2c37c7d63f3a279bb84b6956b849921affed6b806b6ffe7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-assertions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5"
-=======
   checksum: c6e6f355d6ace5f4a9e7bb19f1fed2398aeb9b62c4c671a189d81b124f9f5bb77c4225b6e85e19339268c60a021c1e49104e450375de5e6bb70612190d9678af
   languageName: node
   linkType: hard
@@ -902,20 +615,10 @@ __metadata:
 "@babel/plugin-syntax-import-assertions@npm:^7.22.5, @babel/plugin-syntax-import-assertions@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-import-attributes@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5"
-=======
   checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7
   languageName: node
   linkType: hard
@@ -923,16 +626,11 @@ __metadata:
 "@babel/plugin-syntax-import-attributes@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 197b3c5ea2a9649347f033342cb222ab47f4645633695205c0250c6bf2af29e643753b8bb24a2db39948bef08e7c540babfd365591eb57fc110cb30b425ffc47
-=======
   checksum: 9aed7661ffb920ca75df9f494757466ca92744e43072e0848d87fa4aa61a3f2ee5a22198ac1959856c036434b5614a8f46f1fb70298835dbe28220cdd1d4c11e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -958,24 +656,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
-=======
 "@babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.7.2":
   version: 7.23.3
   resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
-=======
   checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -1067,24 +755,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-syntax-typescript@npm:^7.22.5, @babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-typescript@npm:7.22.5"
-=======
 "@babel/plugin-syntax-typescript@npm:^7.23.3, @babel/plugin-syntax-typescript@npm:^7.7.2":
   version: 7.23.3
   resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a
-=======
   checksum: abfad3a19290d258b028e285a1f34c9b8a0cbe46ef79eafed4ed7ffce11b5d0720b5e536c82f91cbd8442cde35a3dd8e861fa70366d87ff06fdc0d4756e30876
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -1100,28 +778,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-transform-arrow-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5"
-=======
 "@babel/plugin-transform-arrow-functions@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.2":
-  version: 7.23.2
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.2"
-=======
   checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66
   languageName: node
   linkType: hard
@@ -1129,7 +792,6 @@ __metadata:
 "@babel/plugin-transform-async-generator-functions@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-environment-visitor": ^7.22.20
     "@babel/helper-plugin-utils": ^7.22.5
@@ -1137,28 +799,6 @@ __metadata:
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: e1abae0edcda7304d7c17702ac25a127578791b89c4f767d60589249fa3e50ec33f8c9ff39d3d8d41f00b29947654eaddd4fd586e04c4d598122db745fab2868
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5"
-  dependencies:
-    "@babel/helper-module-imports": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-remap-async-to-generator": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b95f23f99dcb379a9f0a1c2a3bbea3f8dc0e1b16dc1ac8b484fe378370169290a7a63d520959a9ba1232837cf74a80e23f6facbe14fd42a3cda6d3c2d7168e62
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
-=======
   checksum: e2fc132c9033711d55209f4781e1fc73f0f4da5e0ca80a2da73dec805166b73c92a6e83571a8994cd2c893a28302e24107e90856202b24781bab734f800102bb
   languageName: node
   linkType: hard
@@ -1179,20 +819,10 @@ __metadata:
 "@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.0"
-=======
   checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020
   languageName: node
   linkType: hard
@@ -1200,34 +830,10 @@ __metadata:
 "@babel/plugin-transform-block-scoping@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 0cfe925cc3b5a3ad407e2253fab3ceeaa117a4b291c9cb245578880872999bca91bd83ffa0128ae9ca356330702e1ef1dcb26804f28d2cef678239caf629f73e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-class-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-class-properties@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b830152dfc2ff2f647f0abe76e6251babdfbef54d18c4b2c73a6bf76b1a00050a5d998dac80dc901a48514e95604324943a9dd39317073fe0928b559e0e0c579
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-class-static-block@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.11
-=======
   checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4
   languageName: node
   linkType: hard
@@ -1249,28 +855,10 @@ __metadata:
   resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
   dependencies:
     "@babel/helper-create-class-features-plugin": ^7.22.15
->>>>>>> origin/main
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-class-static-block": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.12.0
-<<<<<<< HEAD
-  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-classes@npm:7.22.15"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.9
-=======
   checksum: c8bfaba19a674fc2eb54edad71e958647360474e3163e8226f1acd63e4e2dbec32a171a0af596c1dc5359aee402cc120fea7abd1fb0e0354b6527f0fc9e8aa1e
   languageName: node
   linkType: hard
@@ -1286,32 +874,10 @@ __metadata:
     "@babel/helper-optimise-call-expression": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-replace-supers": ^7.22.20
->>>>>>> origin/main
     "@babel/helper-split-export-declaration": ^7.22.6
     globals: ^11.1.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: d3f4d0c107dd8a3557ea3575cc777fab27efa92958b41e4a9822f7499725c1f554beae58855de16ddec0a7b694e45f59a26cea8fbde4275563f72f09c6e039a0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/template": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-destructuring@npm:7.23.0"
-=======
   checksum: 6d0dd3b0828e84a139a51b368f33f315edee5688ef72c68ba25e0175c68ea7357f9c8810b3f61713e368a3063cdcec94f3a2db952e453b0b14ef428a34aa8169
   languageName: node
   linkType: hard
@@ -1331,32 +897,10 @@ __metadata:
 "@babel/plugin-transform-destructuring@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: cd6dd454ccc2766be551e4f8a04b1acc2aa539fa19e5c7501c56cc2f8cc921dd41a7ffb78455b4c4b2f954fcab8ca4561ba7c9c7bd5af9f19465243603d18cc3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 409b658d11e3082c8f69e9cdef2d96e4d6d11256f005772425fb230cc48fd05945edbfbcb709dab293a1a2f01f9c8a5bb7b4131e632b23264039d9f95864b453
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
-=======
   checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105
   languageName: node
   linkType: hard
@@ -1376,20 +920,10 @@ __metadata:
 "@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: bb1280fbabaab6fab2ede585df34900712698210a3bd413f4df5bae6d8c24be36b496c92722ae676a7a67d060a4624f4d6c23b923485f906bfba8773c69f55b4
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dynamic-import@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
-=======
   checksum: c2a21c34dc0839590cd945192cbc46fde541a27e140c48fe1808315934664cdbf18db64889e23c4eeb6bad9d3e049482efdca91d29de5734ffc887c4fbabaa16
   languageName: node
   linkType: hard
@@ -1397,33 +931,11 @@ __metadata:
 "@babel/plugin-transform-dynamic-import@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f2d660c1b1d51ad5fec1cd5ad426a52187204068c4158f8c4aa977b31535c61b66898d532603eef21c15756827be8277f724c869b888d560f26d7fe848bb5eae
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
-=======
   checksum: 57a722604c430d9f3dacff22001a5f31250e34785d4969527a2ae9160fa86858d0892c5b9ff7a06a04076f8c76c9e6862e0541aadca9c057849961343aab0845
   languageName: node
   linkType: hard
@@ -1443,33 +955,11 @@ __metadata:
 "@babel/plugin-transform-export-namespace-from@npm:^7.22.11, @babel/plugin-transform-export-namespace-from@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-flow-strip-types@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-flow": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1ba48187d6f33814be01c6870489f0b1858256cf2b9dd7e62f02af8b30049bf375112f1d44692c5fed3cb9cd26ee2fb32e358cd79b6ad2360a51e8f993e861bf
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-for-of@npm:7.22.15"
-=======
   checksum: 9f770a81bfd03b48d6ba155d452946fd56d6ffe5b7d871e9ec2a0b15e0f424273b632f3ed61838b90015b25bbda988896b7a46c7d964fbf8f6feb5820b309f93
   languageName: node
   linkType: hard
@@ -1489,33 +979,10 @@ __metadata:
 "@babel/plugin-transform-for-of@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-for-of@npm:7.23.3"
->>>>>>> origin/main
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: f395ae7bce31e14961460f56cf751b5d6e37dd27d7df5b1f4e49fec1c11b6f9cf71991c7ffbe6549878591e87df0d66af798cf26edfa4bfa6b4c3dba1fb2f73a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-function-name@npm:7.22.5"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-json-strings@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
-=======
   checksum: a6288122a5091d96c744b9eb23dc1b2d4cce25f109ac1e26a0ea03c4ea60330e6f3cc58530b33ba7369fa07163b71001399a145238b7e92bff6270ef3b9c32a0
   languageName: node
   linkType: hard
@@ -1536,21 +1003,11 @@ __metadata:
 "@babel/plugin-transform-json-strings@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-literals@npm:7.22.5"
-=======
   checksum: f9019820233cf8955d8ba346df709a0683c120fe86a24ed1c9f003f2db51197b979efc88f010d558a12e1491210fc195a43cd1c7fee5e23b92da38f793a875de
   languageName: node
   linkType: hard
@@ -1558,20 +1015,10 @@ __metadata:
 "@babel/plugin-transform-literals@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-literals@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
-=======
   checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed
   languageName: node
   linkType: hard
@@ -1579,21 +1026,11 @@ __metadata:
 "@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5"
-=======
   checksum: 2ae1dc9b4ff3bf61a990ff3accdecb2afe3a0ca649b3e74c010078d1cdf29ea490f50ac0a905306a2bcf9ac177889a39ac79bdcc3a0fdf220b3b75fac18d39b5
   languageName: node
   linkType: hard
@@ -1601,34 +1038,10 @@ __metadata:
 "@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
->>>>>>> origin/main
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.0
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5d92875170a37b8282d4bcd805f55829b8fab0f9c8d08b53d32a7a0bfdc62b868e489b52d329ae768ecafc0c993eed0ad7a387baa673ac33211390a9f833ab5d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.0"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.23.0
-=======
   checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db
   languageName: node
   linkType: hard
@@ -1650,23 +1063,10 @@ __metadata:
   resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
   dependencies:
     "@babel/helper-module-transforms": ^7.23.3
->>>>>>> origin/main
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-simple-access": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 7fb25997194053e167c4207c319ff05362392da841bd9f42ddb3caf9c8798a5d203bd926d23ddf5830fdf05eddc82c2810f40d1287e3a4f80b07eff13d1024b5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.0"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.23.0
-=======
   checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7
   languageName: node
   linkType: hard
@@ -1677,26 +1077,10 @@ __metadata:
   dependencies:
     "@babel/helper-hoist-variables": ^7.22.5
     "@babel/helper-module-transforms": ^7.23.3
->>>>>>> origin/main
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-validator-identifier": ^7.22.20
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 2d481458b22605046badea2317d5cc5c94ac3031c2293e34c96f02063f5b02af0979c4da6a8fbc67cc249541575dc9c6d710db6b919ede70b7337a22d9fd57a7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 46622834c54c551b231963b867adbc80854881b3e516ff29984a8da989bd81665bd70e8cba6710345248e97166689310f544aee1a5773e262845a8f1b3e5b8b4
-=======
   checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f
   languageName: node
   linkType: hard
@@ -1710,7 +1094,6 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0-0
   checksum: 586a7a2241e8b4e753a37af9466a9ffa8a67b4ba9aa756ad7500712c05d8fa9a8c1ed4f7bd25fae2a8265e6cf8fe781ec85a8ee885dd34cf50d8955ee65f12dc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -1726,28 +1109,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-transform-new-target@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
-=======
 "@babel/plugin-transform-new-target@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 6b72112773487a881a1d6ffa680afde08bad699252020e86122180ee7a88854d5da3f15d9bca3331cf2e025df045604494a8208a2e63b486266b07c14e2ffbf3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
-=======
   checksum: e5053389316fce73ad5201b7777437164f333e24787fbcda4ae489cd2580dbbbdfb5694a7237bad91fabb46b591d771975d69beb1c740b82cb4761625379f00b
   languageName: node
   linkType: hard
@@ -1755,21 +1123,11 @@ __metadata:
 "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-numeric-separator@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
-=======
   checksum: a27d73ea134d3d9560a6b2e26ab60012fba15f1db95865aa0153c18f5ec82cfef6a7b3d8df74e3c2fca81534fa5efeb6cacaf7b08bdb7d123e3dafdd079886a3
   languageName: node
   linkType: hard
@@ -1777,48 +1135,11 @@ __metadata:
 "@babel/plugin-transform-numeric-separator@npm:^7.22.11, @babel/plugin-transform-numeric-separator@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
-  dependencies:
-    "@babel/compat-data": ^7.22.9
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.22.15
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 62197a6f12289c1c1bd57f3bed9f0f765ca32390bfe91e0b5561dd94dd9770f4480c4162dec98da094bc0ba99d2c2ebba68de47c019454041b0b7a68ba2ec66d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-object-super@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
-=======
   checksum: 6ba0e5db3c620a3ec81f9e94507c821f483c15f196868df13fa454cbac719a5449baf73840f5b6eb7d77311b24a2cf8e45db53700d41727f693d46f7caf3eec3
   languageName: node
   linkType: hard
@@ -1853,21 +1174,11 @@ __metadata:
 "@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.0"
-=======
   checksum: d50b5ee142cdb088d8b5de1ccf7cea85b18b85d85b52f86618f6e45226372f01ad4cdb29abd4fd35ea99a71fefb37009e0107db7a787dcc21d4d402f97470faf
   languageName: node
   linkType: hard
@@ -1875,22 +1186,12 @@ __metadata:
 "@babel/plugin-transform-optional-chaining@npm:^7.23.0, @babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: f702634f2b97e5260dbec0d4bde05ccb6f4d96d7bfa946481aeacfa205ca846cb6e096a38312f9d51fdbdac1f258f211138c5f7075952e46a5bf8574de6a1329
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
-=======
   checksum: e7a4c08038288057b7a08d68c4d55396ada9278095509ca51ed8dfb72a7f13f26bdd7c5185de21079fe0a9d60d22c227cb32e300d266c1bda40f70eee9f4bc1e
   languageName: node
   linkType: hard
@@ -1898,35 +1199,10 @@ __metadata:
 "@babel/plugin-transform-parameters@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 541188bb7d1876cad87687b5c7daf90f63d8208ae83df24acb1e2b05020ad1c78786b2723ca4054a83fcb74fb6509f30c4cacc5b538ee684224261ad5fb047c1
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-private-methods@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-private-methods@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 321479b4fcb6d3b3ef622ab22fd24001e43d46e680e8e41324c033d5810c84646e470f81b44cbcbef5c22e99030784f7cac92f1829974da7a47a60a7139082c3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
-  version: 7.22.11
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.11
-=======
   checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16
   languageName: node
   linkType: hard
@@ -1949,20 +1225,10 @@ __metadata:
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
     "@babel/helper-create-class-features-plugin": ^7.22.15
->>>>>>> origin/main
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-property-literals@npm:7.22.5"
-=======
   checksum: fb7adfe94ea97542f250a70de32bddbc3e0b802381c92be947fec83ebffda57e68533c4d0697152719a3496fdd3ebf3798d451c024cd4ac848fc15ac26b70aa7
   languageName: node
   linkType: hard
@@ -1970,20 +1236,10 @@ __metadata:
 "@babel/plugin-transform-property-literals@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-display-name@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.22.5"
-=======
   checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9
   languageName: node
   linkType: hard
@@ -1991,16 +1247,11 @@ __metadata:
 "@babel/plugin-transform-react-display-name@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: a12bfd1e4e93055efca3ace3c34722571bda59d9740dca364d225d9c6e3ca874f134694d21715c42cc63d79efd46db9665bd4a022998767f9245f1e29d5d204d
-=======
   checksum: 7f86964e8434d3ddbd3c81d2690c9b66dbf1cd8bd9512e2e24500e9fa8cf378bc52c0853270b3b82143aba5965aec04721df7abdb768f952b44f5c6e0b198779
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -2015,28 +1266,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-transform-react-jsx-self@npm:^7.18.6, @babel/plugin-transform-react-jsx-self@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.22.5"
-=======
 "@babel/plugin-transform-react-jsx-self@npm:^7.18.6, @babel/plugin-transform-react-jsx-self@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-react-jsx-self@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 671eebfabd14a0c7d6ae805fff7e289dfdb7ba984bb100ea2ef6dad1d6a665ebbb09199ab2e64fca7bc78bd0fdc80ca897b07996cf215fafc32c67bc564309af
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-jsx-source@npm:^7.19.6, @babel/plugin-transform-react-jsx-source@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.22.5"
-=======
   checksum: 882bf56bc932d015c2d83214133939ddcf342e5bcafa21f1a93b19f2e052145115e1e0351730897fd66e5f67cad7875b8a8d81ceb12b6e2a886ad0102cb4eb1f
   languageName: node
   linkType: hard
@@ -2044,44 +1280,21 @@ __metadata:
 "@babel/plugin-transform-react-jsx-source@npm:^7.19.6, @babel/plugin-transform-react-jsx-source@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-react-jsx-source@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 4ca2bd62ca14f8bbdcda9139f3f799e1c1c1bae504b67c1ca9bca142c53d81926d1a2b811f66a625f20999b2d352131053d886601f1ba3c1e9378c104d884277
-=======
   checksum: 92287fb797e522d99bdc77eaa573ce79ff0ad9f1cf4e7df374645e28e51dce0adad129f6f075430b129b5bac8dad843f65021970e12e992d6d6671f0d65bb1e0
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
-<<<<<<< HEAD
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15"
-=======
   version: 7.23.4
   resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
->>>>>>> origin/main
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-<<<<<<< HEAD
-    "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/types": ^7.22.15
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3899054e89550c3a0ef041af7c47ee266e2e934f498ee80fefeda778a6aa177b48aa8b4d2a8bf5848de977fec564571699ab952d9fa089c4c19b45ddb121df09
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-react-pure-annotations@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.22.5"
-=======
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-jsx": ^7.23.3
     "@babel/types": ^7.23.4
   peerDependencies:
@@ -2093,21 +1306,11 @@ __metadata:
 "@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 092021c4f404e267002099ec20b3f12dd730cb90b0d83c5feed3dc00dbe43b9c42c795a18e7c6c7d7bddea20c7dd56221b146aec81b37f2e7eb5137331c61120
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
-=======
   checksum: 9ea3698b1d422561d93c0187ac1ed8f2367e4250b10e259785ead5aa643c265830fd0f4cf5087a5bedbc4007444c06da2f2006686613220acf0949895f453666
   languageName: node
   linkType: hard
@@ -2115,21 +1318,11 @@ __metadata:
 "@babel/plugin-transform-regenerator@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     regenerator-transform: ^0.15.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: e13678d62d6fa96f11cb8b863f00e8693491e7adc88bfca3f2820f80cbac8336e7dec3a596eee6a1c4663b7ececc3564f2cd7fb44ed6d4ce84ac2bb7f39ecc6e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5"
-=======
   checksum: 7fdacc7b40008883871b519c9e5cdea493f75495118ccc56ac104b874983569a24edd024f0f5894ba1875c54ee2b442f295d6241c3280e61c725d0dd3317c8e6
   languageName: node
   linkType: hard
@@ -2137,16 +1330,11 @@ __metadata:
 "@babel/plugin-transform-reserved-words@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 3ffd7dbc425fe8132bfec118b9817572799cab1473113a635d25ab606c1f5a2341a636c04cf6b22df3813320365ed5a965b5eeb3192320a10e4cc2c137bd8bfc
-=======
   checksum: 298c4440ddc136784ff920127cea137168e068404e635dc946ddb5d7b2a27b66f1dd4c4acb01f7184478ff7d5c3e7177a127279479926519042948fb7fa0fa48
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -2166,28 +1354,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
-=======
 "@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-spread@npm:7.22.5"
-=======
   checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326
   languageName: node
   linkType: hard
@@ -2195,21 +1368,11 @@ __metadata:
 "@babel/plugin-transform-spread@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-spread@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
-=======
   checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2
   languageName: node
   linkType: hard
@@ -2217,20 +1380,10 @@ __metadata:
 "@babel/plugin-transform-sticky-regex@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 63b2c575e3e7f96c32d52ed45ee098fb7d354b35c2223b8c8e76840b32cc529ee0c0ceb5742fd082e56e91e3d82842a367ce177e82b05039af3d602c9627a729
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
-=======
   checksum: 53e55eb2575b7abfdb4af7e503a2bf7ef5faf8bf6b92d2cd2de0700bdd19e934e5517b23e6dfed94ba50ae516b62f3f916773ef7d9bc81f01503f585051e2949
   languageName: node
   linkType: hard
@@ -2238,20 +1391,10 @@ __metadata:
 "@babel/plugin-transform-template-literals@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
->>>>>>> origin/main
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
-=======
   checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2
   languageName: node
   linkType: hard
@@ -2259,34 +1402,10 @@ __metadata:
 "@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
->>>>>>> origin/main
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/plugin-transform-typescript@npm:7.22.15"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.15
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-typescript": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c5d96cdbf0e1512707aa1c1e3ac6b370a25fd9c545d26008ce44eb13a47bd7fd67a1eb799c98b5ccc82e33a345fda55c0055e1fe3ed97646ed405dd13020b226
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
-  version: 7.22.10
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
-=======
   checksum: 0af7184379d43afac7614fc89b1bdecce4e174d52f4efaeee8ec1a4f2c764356c6dba3525c0685231f1cbf435b6dd4ee9e738d7417f3b10ce8bbe869c32f4384
   languageName: node
   linkType: hard
@@ -2308,50 +1427,10 @@ __metadata:
 "@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
->>>>>>> origin/main
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 807f40ed1324c8cb107c45358f1903384ca3f0ef1d01c5a3c5c9b271c8d8eec66936a3dcc8d75ddfceea9421420368c2e77ae3adef0a50557e778dfe296bf382
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2495e5f663cb388e3d888b4ba3df419ac436a5012144ac170b622ddfc221f9ea9bdba839fa2bc0185cb776b578030666406452ec7791cbf0e7a3d4c88ae9574c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6b5d1404c8c623b0ec9bd436c00d885a17d6a34f3f2597996343ddb9d94f6379705b21582dfd4cec2c47fd34068872e74ab6b9580116c0566b3f9447e2a7fa06
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: c042070f980b139547f8b0179efbc049ac5930abec7fc26ed7a41d89a048d8ab17d362200e204b6f71c3c20d6991a0e74415e1a412a49adc8131c2a40c04822e
-=======
   checksum: 561c429183a54b9e4751519a3dfba6014431e9cdc1484fad03bdaf96582dfc72c76a4f8661df2aeeae7c34efd0fa4d02d3b83a2f63763ecf71ecc925f9cc1f60
   languageName: node
   linkType: hard
@@ -2389,22 +1468,10 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0
   checksum: 79d0b4c951955ca68235c87b91ab2b393c96285f8aeaa34d6db416d2ddac90000c9bd6e8c4d82b60a2b484da69930507245035f28ba63c6cae341cf3ba68fdef
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/preset-env@npm:^7.20.2, @babel/preset-env@npm:^7.23.2":
-<<<<<<< HEAD
-  version: 7.23.2
-  resolution: "@babel/preset-env@npm:7.23.2"
-  dependencies:
-    "@babel/compat-data": ^7.23.2
-    "@babel/helper-compilation-targets": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.15
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.15
-=======
   version: 7.23.5
   resolution: "@babel/preset-env@npm:7.23.5"
   dependencies:
@@ -2415,20 +1482,14 @@ __metadata:
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3
     "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.3
->>>>>>> origin/main
     "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
     "@babel/plugin-syntax-async-generators": ^7.8.4
     "@babel/plugin-syntax-class-properties": ^7.12.13
     "@babel/plugin-syntax-class-static-block": ^7.14.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-<<<<<<< HEAD
-    "@babel/plugin-syntax-import-assertions": ^7.22.5
-    "@babel/plugin-syntax-import-attributes": ^7.22.5
-=======
     "@babel/plugin-syntax-import-assertions": ^7.23.3
     "@babel/plugin-syntax-import-attributes": ^7.23.3
->>>>>>> origin/main
     "@babel/plugin-syntax-import-meta": ^7.10.4
     "@babel/plugin-syntax-json-strings": ^7.8.3
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
@@ -2440,58 +1501,6 @@ __metadata:
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
     "@babel/plugin-syntax-top-level-await": ^7.14.5
     "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
-<<<<<<< HEAD
-    "@babel/plugin-transform-arrow-functions": ^7.22.5
-    "@babel/plugin-transform-async-generator-functions": ^7.23.2
-    "@babel/plugin-transform-async-to-generator": ^7.22.5
-    "@babel/plugin-transform-block-scoped-functions": ^7.22.5
-    "@babel/plugin-transform-block-scoping": ^7.23.0
-    "@babel/plugin-transform-class-properties": ^7.22.5
-    "@babel/plugin-transform-class-static-block": ^7.22.11
-    "@babel/plugin-transform-classes": ^7.22.15
-    "@babel/plugin-transform-computed-properties": ^7.22.5
-    "@babel/plugin-transform-destructuring": ^7.23.0
-    "@babel/plugin-transform-dotall-regex": ^7.22.5
-    "@babel/plugin-transform-duplicate-keys": ^7.22.5
-    "@babel/plugin-transform-dynamic-import": ^7.22.11
-    "@babel/plugin-transform-exponentiation-operator": ^7.22.5
-    "@babel/plugin-transform-export-namespace-from": ^7.22.11
-    "@babel/plugin-transform-for-of": ^7.22.15
-    "@babel/plugin-transform-function-name": ^7.22.5
-    "@babel/plugin-transform-json-strings": ^7.22.11
-    "@babel/plugin-transform-literals": ^7.22.5
-    "@babel/plugin-transform-logical-assignment-operators": ^7.22.11
-    "@babel/plugin-transform-member-expression-literals": ^7.22.5
-    "@babel/plugin-transform-modules-amd": ^7.23.0
-    "@babel/plugin-transform-modules-commonjs": ^7.23.0
-    "@babel/plugin-transform-modules-systemjs": ^7.23.0
-    "@babel/plugin-transform-modules-umd": ^7.22.5
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
-    "@babel/plugin-transform-new-target": ^7.22.5
-    "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.11
-    "@babel/plugin-transform-numeric-separator": ^7.22.11
-    "@babel/plugin-transform-object-rest-spread": ^7.22.15
-    "@babel/plugin-transform-object-super": ^7.22.5
-    "@babel/plugin-transform-optional-catch-binding": ^7.22.11
-    "@babel/plugin-transform-optional-chaining": ^7.23.0
-    "@babel/plugin-transform-parameters": ^7.22.15
-    "@babel/plugin-transform-private-methods": ^7.22.5
-    "@babel/plugin-transform-private-property-in-object": ^7.22.11
-    "@babel/plugin-transform-property-literals": ^7.22.5
-    "@babel/plugin-transform-regenerator": ^7.22.10
-    "@babel/plugin-transform-reserved-words": ^7.22.5
-    "@babel/plugin-transform-shorthand-properties": ^7.22.5
-    "@babel/plugin-transform-spread": ^7.22.5
-    "@babel/plugin-transform-sticky-regex": ^7.22.5
-    "@babel/plugin-transform-template-literals": ^7.22.5
-    "@babel/plugin-transform-typeof-symbol": ^7.22.5
-    "@babel/plugin-transform-unicode-escapes": ^7.22.10
-    "@babel/plugin-transform-unicode-property-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-regex": ^7.22.5
-    "@babel/plugin-transform-unicode-sets-regex": ^7.22.5
-    "@babel/preset-modules": 0.1.6-no-external-plugins
-    "@babel/types": ^7.23.0
-=======
     "@babel/plugin-transform-arrow-functions": ^7.23.3
     "@babel/plugin-transform-async-generator-functions": ^7.23.4
     "@babel/plugin-transform-async-to-generator": ^7.23.3
@@ -2541,7 +1550,6 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": ^7.23.3
     "@babel/plugin-transform-unicode-sets-regex": ^7.23.3
     "@babel/preset-modules": 0.1.6-no-external-plugins
->>>>>>> origin/main
     babel-plugin-polyfill-corejs2: ^0.4.6
     babel-plugin-polyfill-corejs3: ^0.8.5
     babel-plugin-polyfill-regenerator: ^0.5.3
@@ -2549,26 +1557,11 @@ __metadata:
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-<<<<<<< HEAD
-  checksum: 49327ef584b529b56aedd6577937b80c0d89603c68b23795495a13af04b5aa008db9ad04cd280423600cdc0d3cce13ae9d0d9a977db5c8193697b20ced8a10b2
-=======
   checksum: adddd58d14fc1b2e5f8cf90995f522879362a0543e316afe9e5783f1bd715bb1e92300cd49d7ce3a95c64a96d60788d0089651e2cf4cac937f5469aac1087bb1
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/preset-flow@npm:^7.22.15":
-<<<<<<< HEAD
-  version: 7.22.15
-  resolution: "@babel/preset-flow@npm:7.22.15"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-transform-flow-strip-types": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 17f8b80b1012802f983227b423c8823990db9748aec4f8bfd56ff774d8d954e9bdea67377788abac526754b3d307215c063c9beadf5f1b4331b30d4ba0593286
-=======
   version: 7.23.3
   resolution: "@babel/preset-flow@npm:7.23.3"
   dependencies:
@@ -2578,7 +1571,6 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0-0
   checksum: 60b5dde79621ae89943af459c4dc5b6030795f595a20ca438c8100f8d82c9ebc986881719030521ff5925799518ac5aa7f3fe62af8c33ab96be3681a71f88d03
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -2596,20 +1588,6 @@ __metadata:
   linkType: hard
 
 "@babel/preset-react@npm:^7.18.6, @babel/preset-react@npm:^7.22.15":
-<<<<<<< HEAD
-  version: 7.22.15
-  resolution: "@babel/preset-react@npm:7.22.15"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-transform-react-display-name": ^7.22.5
-    "@babel/plugin-transform-react-jsx": ^7.22.15
-    "@babel/plugin-transform-react-jsx-development": ^7.22.5
-    "@babel/plugin-transform-react-pure-annotations": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c3ef99dfa2e9f57d2e08603e883aa20f47630a826c8e413888a93ae6e0084b5016871e463829be125329d40a1ba0a89f7c43d77b6dab52083c225cb43e63d10e
-=======
   version: 7.23.3
   resolution: "@babel/preset-react@npm:7.23.3"
   dependencies:
@@ -2622,24 +1600,10 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0-0
   checksum: 2d90961e7e627a74b44551e88ad36a440579e283e8dc27972bf2f50682152bbc77228673a3ea22c0e0d005b70cbc487eccd64897c5e5e0384e5ce18f300b21eb
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/preset-typescript@npm:^7.18.6, @babel/preset-typescript@npm:^7.23.0, @babel/preset-typescript@npm:^7.23.2":
-<<<<<<< HEAD
-  version: 7.23.2
-  resolution: "@babel/preset-typescript@npm:7.23.2"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.15
-    "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.23.0
-    "@babel/plugin-transform-typescript": ^7.22.15
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c4b065c90e7f085dd7a0e57032983ac230c7ffd1d616e4c2b66581e765d5befc9271495f33250bf1cf9b4d436239c8ca3b19ada9f6c419c70bdab2cf6c868f9f
-=======
   version: 7.23.3
   resolution: "@babel/preset-typescript@npm:7.23.3"
   dependencies:
@@ -2651,7 +1615,6 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0-0
   checksum: 105a2d39bbc464da0f7e1ad7f535c77c5f62d6b410219355b20e552e7d29933567a5c55339b5d0aec1a5c7a0a7dfdf1b54aae601a4fe15a157d54dcbfcb3e854
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -2678,32 +1641,15 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-<<<<<<< HEAD
-  version: 7.23.2
-  resolution: "@babel/runtime@npm:7.23.2"
-  dependencies:
-    regenerator-runtime: ^0.14.0
-  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
-=======
   version: 7.23.5
   resolution: "@babel/runtime@npm:7.23.5"
   dependencies:
     regenerator-runtime: ^0.14.0
   checksum: 164d9802424f06908e62d29b8fd3a87db55accf82f46f964ac481dcead11ff7df8391e3696e5fa91a8ca10ea8845bf650acd730fa88cf13f8026cd8d5eec6936
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@babel/standalone@npm:^7.20.6":
-<<<<<<< HEAD
-  version: 7.23.2
-  resolution: "@babel/standalone@npm:7.23.2"
-  checksum: ab086858b3d4180b822fb370956704d3d052c616f153a87ec20bbeb59f9bb59069bd95788fdd04b73dfb182ec3b711d0b23aeaeb0c41cd5d8dc35e36100408ae
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
-=======
   version: 7.23.5
   resolution: "@babel/standalone@npm:7.23.5"
   checksum: f9af98b3866b824ac523dd48dee22d434aa0e54256e2595a684e84216bad3922f6fd53b4187b7c9f9e0fd78799968ef657a8f3cb63ce3d82ae51f630137df82a
@@ -2711,7 +1657,6 @@ __metadata:
   linkType: hard
 
 "@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
->>>>>>> origin/main
   version: 7.22.15
   resolution: "@babel/template@npm:7.22.15"
   dependencies:
@@ -2722,11 +1667,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/traverse@npm:7.23.2, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.4.5":
-=======
 "@babel/traverse@npm:7.23.2":
->>>>>>> origin/main
   version: 7.23.2
   resolution: "@babel/traverse@npm:7.23.2"
   dependencies:
@@ -2744,8 +1685,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.5, @babel/traverse@npm:^7.4.5":
   version: 7.23.5
   resolution: "@babel/traverse@npm:7.23.5"
@@ -2764,7 +1703,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "@babel/types@npm:7.17.0":
   version: 7.17.0
   resolution: "@babel/types@npm:7.17.0"
@@ -2775,22 +1713,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.0
-  resolution: "@babel/types@npm:7.23.0"
-  dependencies:
-    "@babel/helper-string-parser": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.20
-    to-fast-properties: ^2.0.0
-  checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.17.0":
-=======
 "@babel/types@npm:^7.0.0, @babel/types@npm:^7.17.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
->>>>>>> origin/main
   version: 7.23.5
   resolution: "@babel/types@npm:7.23.5"
   dependencies:
@@ -3062,13 +1985,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/autocomplete@npm:^6.0.0, @codemirror/autocomplete@npm:^6.1.0, @codemirror/autocomplete@npm:^6.7.1":
-<<<<<<< HEAD
-  version: 6.10.2
-  resolution: "@codemirror/autocomplete@npm:6.10.2"
-=======
   version: 6.11.1
   resolution: "@codemirror/autocomplete@npm:6.11.1"
->>>>>>> origin/main
   dependencies:
     "@codemirror/language": ^6.0.0
     "@codemirror/state": ^6.0.0
@@ -3079,32 +1997,19 @@ __metadata:
     "@codemirror/state": ^6.0.0
     "@codemirror/view": ^6.0.0
     "@lezer/common": ^1.0.0
-<<<<<<< HEAD
-  checksum: 360cea6a87ae9c4e3c996903f636a8f47f8ea6cd44504181e69dd8ccf666bad3e8cc6d8935e0eedd8aa118fdfe86ea78f41bc15288f3a7517dbb87115e057563
-=======
   checksum: 69cb77d51dbc4c76a990fb8e562075d6fa11b2aef00fce33d2a98dd701f6a89050b1b464ae8ee1e2cbe1a4210522b1a3c2260cdf5c933a062093acaf98a5eedc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@codemirror/commands@npm:^6.0.0, @codemirror/commands@npm:^6.0.1, @codemirror/commands@npm:^6.1.0":
-<<<<<<< HEAD
-  version: 6.3.0
-  resolution: "@codemirror/commands@npm:6.3.0"
-=======
   version: 6.3.2
   resolution: "@codemirror/commands@npm:6.3.2"
->>>>>>> origin/main
   dependencies:
     "@codemirror/language": ^6.0.0
     "@codemirror/state": ^6.2.0
     "@codemirror/view": ^6.0.0
     "@lezer/common": ^1.1.0
-<<<<<<< HEAD
-  checksum: d6ade0ba7d4f80c2e44163935783d2f2f35c8b641a4b4f62452c0630211670abe5093786cf5a4af14147102d4284dae660a26f3ae58fd840e838685a81107d11
-=======
   checksum: 683c444d8e6ad889ab5efd0d742b0fa28b78c8cad63276ec60d298b13d4939c8bd7e1d6fd3535645b8d255147de0d3aef46d89a29c19d0af58a7f2914bdcb3ab
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3122,13 +2027,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/lang-html@npm:^6.0.0, @codemirror/lang-html@npm:^6.4.0":
-<<<<<<< HEAD
-  version: 6.4.6
-  resolution: "@codemirror/lang-html@npm:6.4.6"
-=======
   version: 6.4.7
   resolution: "@codemirror/lang-html@npm:6.4.7"
->>>>>>> origin/main
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/lang-css": ^6.0.0
@@ -3139,11 +2039,7 @@ __metadata:
     "@lezer/common": ^1.0.0
     "@lezer/css": ^1.1.0
     "@lezer/html": ^1.3.0
-<<<<<<< HEAD
-  checksum: 8f884f4423ffc783181ee933f7212ad4ece204695cf8af9535a593f95e901d36515a8561fc336a0fbcf5782369b9484eeb0d2cec2167622868238177c5e6eb36
-=======
   checksum: 26e3d9243bd8dea2c0f7769315f8ed4b77969497f52c545c84ff32f155489b3a29e476aa78ffc11e910a0f927bbebce4d28f4e17e1994f6c9d8df6bdd3c33ef1
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3183,13 +2079,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/lang-markdown@npm:^6.0.5":
-<<<<<<< HEAD
-  version: 6.2.2
-  resolution: "@codemirror/lang-markdown@npm:6.2.2"
-=======
   version: 6.2.3
   resolution: "@codemirror/lang-markdown@npm:6.2.3"
->>>>>>> origin/main
   dependencies:
     "@codemirror/autocomplete": ^6.7.1
     "@codemirror/lang-html": ^6.0.0
@@ -3198,11 +2089,7 @@ __metadata:
     "@codemirror/view": ^6.0.0
     "@lezer/common": ^1.0.0
     "@lezer/markdown": ^1.0.0
-<<<<<<< HEAD
-  checksum: 36aa82a4fc07e5761e0e04108b54f112f0049ed210b3d4e81b7429a99be4677a1f9ef0e004c5243265dca3bac36525792cb1558999f6a224c689475e958d4aa8
-=======
   checksum: 9b9e13cca288c36c68ad7e2cc5058cb4da2232e74479124c4952ecd2310d2e91f182c606414680570218119ceae99bdab6540dce081ce564030c9e4cadc96a64
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3233,13 +2120,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.2.1, @codemirror/language@npm:^6.3.0, @codemirror/language@npm:^6.4.0, @codemirror/language@npm:^6.6.0":
-<<<<<<< HEAD
-  version: 6.9.2
-  resolution: "@codemirror/language@npm:6.9.2"
-=======
   version: 6.9.3
   resolution: "@codemirror/language@npm:6.9.3"
->>>>>>> origin/main
   dependencies:
     "@codemirror/state": ^6.0.0
     "@codemirror/view": ^6.0.0
@@ -3247,11 +2129,7 @@ __metadata:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
     style-mod: ^4.0.0
-<<<<<<< HEAD
-  checksum: eee7b861b5591114cac7502cd532d5b923639740081a4cd7e28696c252af8d759b14686aaf6d5eee7e0969ff647b7aaf03a5eea7235fb6d9858ee19433f1c74d
-=======
   checksum: 774a40bc91c748d418a9a774161a5b083061124e4439bb753072bc657ec4c4784f595161c10c7c3935154b22291bf6dc74c9abe827033db32e217ac3963478f3
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3276,35 +2154,20 @@ __metadata:
   linkType: hard
 
 "@codemirror/search@npm:^6.0.0, @codemirror/search@npm:^6.0.1":
-<<<<<<< HEAD
-  version: 6.5.4
-  resolution: "@codemirror/search@npm:6.5.4"
-=======
   version: 6.5.5
   resolution: "@codemirror/search@npm:6.5.5"
->>>>>>> origin/main
   dependencies:
     "@codemirror/state": ^6.0.0
     "@codemirror/view": ^6.0.0
     crelt: ^1.0.5
-<<<<<<< HEAD
-  checksum: 32a68e40486730949ee79f54b9fcc6c744559aef188d3c5bf82881f62e5fc9468fa21cf227507638160043c797eb054205802a649cf4a2350928fc161d5aac40
-=======
   checksum: 825196ef63273494ba9a6153b01eda385edb65e77a1e49980dd3a28d4a692af1e9575e03e4b6c84f6fa2afe72217113ff4c50f58b20d13fe0d277cda5dd7dc81
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.1.0, @codemirror/state@npm:^6.1.1, @codemirror/state@npm:^6.1.4, @codemirror/state@npm:^6.2.0":
-<<<<<<< HEAD
-  version: 6.3.1
-  resolution: "@codemirror/state@npm:6.3.1"
-  checksum: 8e7e55b3824653936606b31f146737459cb6654c935d668e7f36113ad523e1951966640f647c1286ae4ef22e3f0c7e37a6dfcbbcdb7bbeacca43c17c80fcc918
-=======
   version: 6.3.3
   resolution: "@codemirror/state@npm:6.3.3"
   checksum: 08b075c738cc29391519d3e9b60c4398e7f56ba344983ab9b2263c7ace17d3056e4dcbc2ff651fd49099b48c8b4dc8535404a2f94bd017827f5f90c1045a1b05
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3321,22 +2184,13 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.1.1, @codemirror/view@npm:^6.17.0":
-<<<<<<< HEAD
-  version: 6.22.0
-  resolution: "@codemirror/view@npm:6.22.0"
-=======
   version: 6.22.1
   resolution: "@codemirror/view@npm:6.22.1"
->>>>>>> origin/main
   dependencies:
     "@codemirror/state": ^6.1.4
     style-mod: ^4.1.0
     w3c-keyname: ^2.2.4
-<<<<<<< HEAD
-  checksum: 2a24674687fbde06898d0a131abe5f86a812d79e111cf8dc94110dac86eed8c20a2094b547c1b3c379fe8edf0c66318d03a7594158e4f6628ee060a03a5d1bab
-=======
   checksum: 8643d86cf8c34433a410b28b1339c9a333c519e815890bf6494ca35a47d6ed38b51a13480cf4f6bea319ab2a17991e1ba47cd1b4a2c5a99fb76bad014682925a
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -3583,15 +2437,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/android-arm64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/android-arm64@npm:0.19.5"
-=======
 "@esbuild/android-arm64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/android-arm64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -3603,15 +2451,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/android-arm@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/android-arm@npm:0.19.5"
-=======
 "@esbuild/android-arm@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/android-arm@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -3623,15 +2465,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/android-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/android-x64@npm:0.19.5"
-=======
 "@esbuild/android-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/android-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -3643,15 +2479,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/darwin-arm64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/darwin-arm64@npm:0.19.5"
-=======
 "@esbuild/darwin-arm64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/darwin-arm64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -3663,15 +2493,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/darwin-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/darwin-x64@npm:0.19.5"
-=======
 "@esbuild/darwin-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/darwin-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -3683,15 +2507,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/freebsd-arm64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/freebsd-arm64@npm:0.19.5"
-=======
 "@esbuild/freebsd-arm64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/freebsd-arm64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -3703,15 +2521,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/freebsd-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/freebsd-x64@npm:0.19.5"
-=======
 "@esbuild/freebsd-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/freebsd-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -3723,15 +2535,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-arm64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-arm64@npm:0.19.5"
-=======
 "@esbuild/linux-arm64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-arm64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -3743,15 +2549,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-arm@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-arm@npm:0.19.5"
-=======
 "@esbuild/linux-arm@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-arm@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -3763,15 +2563,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-ia32@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-ia32@npm:0.19.5"
-=======
 "@esbuild/linux-ia32@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-ia32@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -3783,15 +2577,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-loong64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-loong64@npm:0.19.5"
-=======
 "@esbuild/linux-loong64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-loong64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -3803,15 +2591,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-mips64el@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-mips64el@npm:0.19.5"
-=======
 "@esbuild/linux-mips64el@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-mips64el@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -3823,15 +2605,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-ppc64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-ppc64@npm:0.19.5"
-=======
 "@esbuild/linux-ppc64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-ppc64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -3843,15 +2619,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-riscv64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-riscv64@npm:0.19.5"
-=======
 "@esbuild/linux-riscv64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-riscv64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -3863,15 +2633,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-s390x@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-s390x@npm:0.19.5"
-=======
 "@esbuild/linux-s390x@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-s390x@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -3883,15 +2647,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/linux-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/linux-x64@npm:0.19.5"
-=======
 "@esbuild/linux-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/linux-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
@@ -3903,15 +2661,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/netbsd-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/netbsd-x64@npm:0.19.5"
-=======
 "@esbuild/netbsd-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/netbsd-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -3923,15 +2675,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/openbsd-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/openbsd-x64@npm:0.19.5"
-=======
 "@esbuild/openbsd-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/openbsd-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -3943,15 +2689,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/sunos-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/sunos-x64@npm:0.19.5"
-=======
 "@esbuild/sunos-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/sunos-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -3963,15 +2703,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/win32-arm64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/win32-arm64@npm:0.19.5"
-=======
 "@esbuild/win32-arm64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/win32-arm64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -3983,15 +2717,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/win32-ia32@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/win32-ia32@npm:0.19.5"
-=======
 "@esbuild/win32-ia32@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/win32-ia32@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -4003,15 +2731,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@esbuild/win32-x64@npm:0.19.5":
-  version: 0.19.5
-  resolution: "@esbuild/win32-x64@npm:0.19.5"
-=======
 "@esbuild/win32-x64@npm:0.19.8":
   version: 0.19.8
   resolution: "@esbuild/win32-x64@npm:0.19.8"
->>>>>>> origin/main
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -4034,15 +2756,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@eslint/eslintrc@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "@eslint/eslintrc@npm:2.1.3"
-=======
 "@eslint/eslintrc@npm:^2.1.4":
   version: 2.1.4
   resolution: "@eslint/eslintrc@npm:2.1.4"
->>>>>>> origin/main
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
@@ -4053,16 +2769,6 @@ __metadata:
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-<<<<<<< HEAD
-  checksum: 5c6c3878192fe0ddffa9aff08b4e2f3bcc8f1c10d6449b7295a5f58b662019896deabfc19890455ffd7e60a5bd28d25d0eaefb2f78b2d230aae3879af92b89e5
-  languageName: node
-  linkType: hard
-
-"@eslint/js@npm:8.53.0":
-  version: 8.53.0
-  resolution: "@eslint/js@npm:8.53.0"
-  checksum: e0d5cfb0000aaee237c8e6d6d6e366faa60b1ef7f928ce17778373aa44d3b886368f6d5e1f97f913f0f16801aad016db8b8df78418c9d18825c15590328028af
-=======
   checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127
   languageName: node
   linkType: hard
@@ -4071,7 +2777,6 @@ __metadata:
   version: 8.55.0
   resolution: "@eslint/js@npm:8.55.0"
   checksum: fa33ef619f0646ed15649b0c2e313e4d9ccee8425884bdbfc78020d6b6b64c0c42fa9d83061d0e6158e1d4274f03f0f9008786540e2efab8fcdc48082259908c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -4083,32 +2788,18 @@ __metadata:
   linkType: hard
 
 "@figma/plugin-typings@npm:^1.62.0":
-<<<<<<< HEAD
-  version: 1.80.0
-  resolution: "@figma/plugin-typings@npm:1.80.0"
-  checksum: 62f77e28ab316c493f3704b2f8460c717cee670dc5c1bb3d44eca0dfda6ea81b3b891616b3936dad0455709864b2ab6cd1d1f44c217feca62c15553d8ee215b4
-=======
   version: 1.82.0
   resolution: "@figma/plugin-typings@npm:1.82.0"
   checksum: e30b65a1f9dcd989365dc6d2fdec56ac857a6c39b985e99d640b2a9289460fe548097ac8ddbc7a500a645007bb4dd0eba5acfbdb05677fbb0a35aae09be8dcdf
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@floating-ui/core@npm:^1.4.2":
-<<<<<<< HEAD
-  version: 1.5.0
-  resolution: "@floating-ui/core@npm:1.5.0"
-  dependencies:
-    "@floating-ui/utils": ^0.1.3
-  checksum: 54b4fe26b3c228746ac5589f97303abf158b80aa5f8b99027259decd68d1c2030c4c637648ebd33dfe78a4212699453bc2bd7537fd5a594d3bd3e63d362f666f
-=======
   version: 1.5.2
   resolution: "@floating-ui/core@npm:1.5.2"
   dependencies:
     "@floating-ui/utils": ^0.1.3
   checksum: e22de0a5e8a703fe14d9cfb72aeb67c0056c4ae6aa241539934ecb2af56448534b434a7587ecb5de154c21c3c73e44c19249b05c6b67a58eae7861188c8e69ac
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -4135,23 +2826,14 @@ __metadata:
   linkType: hard
 
 "@floating-ui/react-dom@npm:^2.0.0, @floating-ui/react-dom@npm:^2.0.2":
-<<<<<<< HEAD
-  version: 2.0.2
-  resolution: "@floating-ui/react-dom@npm:2.0.2"
-=======
   version: 2.0.4
   resolution: "@floating-ui/react-dom@npm:2.0.4"
->>>>>>> origin/main
   dependencies:
     "@floating-ui/dom": ^1.5.1
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-<<<<<<< HEAD
-  checksum: 4797e1f7a19c1e531ed0d578ccdcbe58970743e5a480ba30424857fc953063f36d481f8c5d69248a8f1d521b739e94bf5e1ffb35506400dea3d914f166ed2f7f
-=======
   checksum: 91b2369e25f84888486e48c1656117468248906034ed482d411bb9ed1061b908dd32435b4ca3d0cd0ca6083291510a98ce74d76c671d5cc25b0c41e5fa824bae
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -4616,109 +3298,59 @@ __metadata:
   linkType: hard
 
 "@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.0.2, @lezer/common@npm:^1.1.0":
-<<<<<<< HEAD
-  version: 1.1.0
-  resolution: "@lezer/common@npm:1.1.0"
-  checksum: 93c208a44d1c0bdf7407853ba7c4ddcedf1c52d1b82170813d83b9bd6301aa23587405ac54332fe39ce8bc37f706936ab237ceb4d3d535d1dead650153b6474c
-=======
   version: 1.1.1
   resolution: "@lezer/common@npm:1.1.1"
   checksum: 1e540c152c5e6000d81aee0d6998dc340f35685d0f3aebf9c83213674b8a84509e0f6a04ea9b28d9d04499f68c2e57b484703bde53eaacf426bc2fac6a9e892c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@lezer/css@npm:^1.0.0, @lezer/css@npm:^1.1.0":
-<<<<<<< HEAD
-  version: 1.1.3
-  resolution: "@lezer/css@npm:1.1.3"
-  dependencies:
-    "@lezer/highlight": ^1.0.0
-    "@lezer/lr": ^1.0.0
-  checksum: c8069ef0a6751441d2dc9180f7ebfd7aeb35df0ca2f1a748a2f26203a9ef6cc30f17f3074e2b49520453eb39329dadfdbbb901c6d9d067dc955ceb58c1f8cc6a
-=======
   version: 1.1.4
   resolution: "@lezer/css@npm:1.1.4"
   dependencies:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
   checksum: 13ffe83e7aaf4213b6a86d01cd68ac02a22e96e9b8ac91368f5f79572cf5e494cee1dc039dc4ed331ba38754681d6013397d06d8c319f1fcb6852b5625eba055
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@lezer/highlight@npm:^1.0.0, @lezer/highlight@npm:^1.1.3":
-<<<<<<< HEAD
-  version: 1.1.6
-  resolution: "@lezer/highlight@npm:1.1.6"
-  dependencies:
-    "@lezer/common": ^1.0.0
-  checksum: 411a702394c4c996b7d7f145a38f3a85a8cc698b3918acc7121c629255bb76d4ab383753f69009e011dc415210c6acbbb5b27bde613259ab67e600b29397b03b
-=======
   version: 1.2.0
   resolution: "@lezer/highlight@npm:1.2.0"
   dependencies:
     "@lezer/common": ^1.0.0
   checksum: 5b9dfe741f95db13f6124cb9556a43011cb8041ecf490be98d44a86b04d926a66e912bcd3a766f6a3d79e064410f1a2f60ab240b50b645a12c56987bf4870086
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@lezer/html@npm:^1.3.0":
-<<<<<<< HEAD
-  version: 1.3.6
-  resolution: "@lezer/html@npm:1.3.6"
-=======
   version: 1.3.7
   resolution: "@lezer/html@npm:1.3.7"
->>>>>>> origin/main
   dependencies:
     "@lezer/common": ^1.0.0
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
-<<<<<<< HEAD
-  checksum: 1d3af781660968505e5083a34f31ea3549fd5f3949227fa93cc318bca61bce76ffe977bd875624ba938a2039834ec1a33df5d365e94c48131c85dd26f980d92c
-=======
   checksum: 7145c0eae4f5cf79e34c6bf2fe3f812460969b58dd8923adeb2d14ddfbd6111fed91eaee24d914430c1dcca711a0aac144afc71df00abb750ed7b9d96a6b6f84
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@lezer/java@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.0.4
-  resolution: "@lezer/java@npm:1.0.4"
-  dependencies:
-    "@lezer/highlight": ^1.0.0
-    "@lezer/lr": ^1.0.0
-  checksum: 97f5a2c2d733afba5dc57a0da9a97515b19b5e63bb5937717dac4e8c9baed74d15c0cb5c1580858b678931f11d517c56d89f903968fa48931f9c62e2ea67a107
-=======
   version: 1.1.0
   resolution: "@lezer/java@npm:1.1.0"
   dependencies:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.0.0
   checksum: b22b344ed770d92c0e90d94caec695210670fa28a828548eeb48415ff3a2920804c3688c85f954e53b5a80b73263edecd6846901561b3837bc332ad09dfa23c2
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@lezer/javascript@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.4.9
-  resolution: "@lezer/javascript@npm:1.4.9"
-  dependencies:
-    "@lezer/highlight": ^1.1.3
-    "@lezer/lr": ^1.3.0
-  checksum: adac0048e4ab33dc48db42014f02d53a2eab81d12c990b23f237a3e83b125bda271607442aaa50dc0ac870a803e678135111366235f7c29a5052a288c1003960
-=======
   version: 1.4.10
   resolution: "@lezer/javascript@npm:1.4.10"
   dependencies:
     "@lezer/highlight": ^1.1.3
     "@lezer/lr": ^1.3.0
   checksum: 4fd222fc81c14eabd7ba938cebb1f8d4be030c394d3cb637682d42f466314ccd52fe64326438265416e20a9104f0e79964a3341e186dabc81d3949c5c0bb5527
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -4742,21 +3374,12 @@ __metadata:
   linkType: hard
 
 "@lezer/markdown@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.1.0
-  resolution: "@lezer/markdown@npm:1.1.0"
-  dependencies:
-    "@lezer/common": ^1.0.0
-    "@lezer/highlight": ^1.0.0
-  checksum: b3699c0724dd41e3e6e3078a0e1bcd272ccaebf17b20e5160de3ecf26200cdaa59aa19c9542aac5ab8c7e3aecce1003544b016bb5c32e458bbd5982add8ca0bf
-=======
   version: 1.1.2
   resolution: "@lezer/markdown@npm:1.1.2"
   dependencies:
     "@lezer/common": ^1.0.0
     "@lezer/highlight": ^1.0.0
   checksum: 9de61f1915220466146086596ace8a48693ca708f8e3ec6f56aff657a18f258a3b6b4a0106662c055bd8eb7dfe11cede1f3d5bfc24e8bd33859e922d12330e93
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -5213,15 +3836,9 @@ __metadata:
   linkType: hard
 
 "@polka/url@npm:^1.0.0-next.20":
-<<<<<<< HEAD
-  version: 1.0.0-next.23
-  resolution: "@polka/url@npm:1.0.0-next.23"
-  checksum: 4b0330de1ceecd1002c7e7449094d0c41f2ed0e21765f4835ccc7b003f2f024ac557d503b9ffdf0918cf50b80d5b8c99dfc5a91927e7b3c468b09c6bb42a3c41
-=======
   version: 1.0.0-next.24
   resolution: "@polka/url@npm:1.0.0-next.24"
   checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -6059,17 +4676,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@remix-run/router@npm:1.11.0":
-  version: 1.11.0
-  resolution: "@remix-run/router@npm:1.11.0"
-  checksum: 1966436ab3ab982862195e4871790644ce21e01511aa3f4350436296224e4dec2e6ee35f1f4cb83db69f7aa0e8ad4a0a01928b05359ae654edc8e2aa82bf754b
-=======
 "@remix-run/router@npm:1.13.1":
   version: 1.13.1
   resolution: "@remix-run/router@npm:1.13.1"
   checksum: cebbf0a8cf31cafd818d8ce42d5b6a0bfdd0e1f81b9ffb7a88c5d7a9d2a81d1fdf098cc8610d34ef3d6cfe7bc778b2ca1fe336a740eb7a175d1234d017927f8a
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -6101,13 +4711,8 @@ __metadata:
   linkType: hard
 
 "@rollup/pluginutils@npm:^5.0.2":
-<<<<<<< HEAD
-  version: 5.0.5
-  resolution: "@rollup/pluginutils@npm:5.0.5"
-=======
   version: 5.1.0
   resolution: "@rollup/pluginutils@npm:5.1.0"
->>>>>>> origin/main
   dependencies:
     "@types/estree": ^1.0.0
     estree-walker: ^2.0.2
@@ -6117,11 +4722,7 @@ __metadata:
   peerDependenciesMeta:
     rollup:
       optional: true
-<<<<<<< HEAD
-  checksum: dcd4d6e3cb6047f18c465a5f2bcd29995c565f083fb6ca5505bcf2018ae0c16634fd38d99538fbb7dcef4e1b491cf4b4465f8845b5666778a925a27e9202dbab
-=======
   checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -6142,11 +4743,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@sanity/block-tools@npm:3.20.0, @sanity/block-tools@npm:^3.20.0":
-=======
 "@sanity/block-tools@npm:3.20.0":
->>>>>>> origin/main
   version: 3.20.0
   resolution: "@sanity/block-tools@npm:3.20.0"
   dependencies:
@@ -6156,8 +4753,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "@sanity/block-tools@npm:^3.20.0":
   version: 3.21.0
   resolution: "@sanity/block-tools@npm:3.21.0"
@@ -6168,7 +4763,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "@sanity/cli@npm:3.20.0":
   version: 3.20.0
   resolution: "@sanity/cli@npm:3.20.0"
@@ -6186,36 +4780,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@sanity/client@npm:^6.6.0, @sanity/client@npm:^6.7.0":
-  version: 6.7.1
-  resolution: "@sanity/client@npm:6.7.1"
-  dependencies:
-    "@sanity/eventsource": ^5.0.0
-    get-it: ^8.4.4
-    rxjs: ^7.0.0
-  checksum: a216ddaa999dbcfcf6eb50b33a20bb4ef4638c29a75d7d03afbce43e1bcb636e9c18097d05a722e7381546a1bc1ecd22608919a469970380148440124c74036a
-  languageName: node
-  linkType: hard
-
-"@sanity/client@npm:^6.8.6":
-  version: 6.8.6
-  resolution: "@sanity/client@npm:6.8.6"
-=======
 "@sanity/client@npm:^6.6.0, @sanity/client@npm:^6.8.6":
   version: 6.9.1
   resolution: "@sanity/client@npm:6.9.1"
->>>>>>> origin/main
   dependencies:
     "@sanity/eventsource": ^5.0.0
     "@vercel/stega": 0.1.0
     get-it: ^8.4.4
     rxjs: ^7.0.0
-<<<<<<< HEAD
-  checksum: 14ad22c33ae3c52dc46e91b271334665cb2844c2455aebdb608e5d1b370ee582836c40568fc4eb1899bd99c51c13f53412f4ea9cc67cf95d95ff2bd91e650aa3
-=======
   checksum: 0199d2399afbefca0ae9f36f18546cc292e59eddb102408b3ca9131a994f687394864679ab8ce6bab61cc2646a42953fb9c5716ec9eec30d412360fb41aa5af9
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -6533,11 +5106,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@sanity/schema@npm:3.20.0, @sanity/schema@npm:^3.20.0":
-=======
 "@sanity/schema@npm:3.20.0":
->>>>>>> origin/main
   version: 3.20.0
   resolution: "@sanity/schema@npm:3.20.0"
   dependencies:
@@ -6552,8 +5121,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "@sanity/schema@npm:^3.20.0":
   version: 3.21.0
   resolution: "@sanity/schema@npm:3.21.0"
@@ -6569,7 +5136,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "@sanity/table@npm:1.0.1":
   version: 1.0.1
   resolution: "@sanity/table@npm:1.0.1"
@@ -6595,38 +5161,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@sanity/types@npm:^3.14.5":
-  version: 3.19.1
-  resolution: "@sanity/types@npm:3.19.1"
-  dependencies:
-    "@sanity/client": ^6.7.0
-    "@types/react": ^18.0.25
-  checksum: ba105900d2fba71a595c0e50c3842f0a2005721f91cf68892f6ab6c7387f36b476913b1bbba3695d502749e1c3b7a1f718cb321a4f49aefa128481a761543a66
-  languageName: node
-  linkType: hard
-
-"@sanity/ui@npm:^1.0.0, @sanity/ui@npm:^1.7.0":
-  version: 1.9.0
-  resolution: "@sanity/ui@npm:1.9.0"
-  dependencies:
-    "@floating-ui/react-dom": 2.0.0
-    "@sanity/color": ^2.2.5
-    "@sanity/icons": ^2.4.1
-    csstype: ^3.1.2
-    framer-motion: ^10.16.2
-    react-refractor: ^2.1.7
-  peerDependencies:
-    react: ^18
-    react-dom: ^18
-    react-is: ^18
-    styled-components: ^5.2 || ^6
-  checksum: 9530347b5d173a8cc96e16b213c7a1fb9fc5eeece630c4ea8252a43e0b7f75f17df6d6be881ed5acf4c384d165e4a57d5c08ec27b93d06d9d916d3395c629a53
-  languageName: node
-  linkType: hard
-
-"@sanity/ui@npm:^1.9.3":
-=======
 "@sanity/types@npm:3.21.0, @sanity/types@npm:^3.14.5":
   version: 3.21.0
   resolution: "@sanity/types@npm:3.21.0"
@@ -6638,7 +5172,6 @@ __metadata:
   linkType: hard
 
 "@sanity/ui@npm:^1.0.0, @sanity/ui@npm:^1.7.0, @sanity/ui@npm:^1.9.3":
->>>>>>> origin/main
   version: 1.9.3
   resolution: "@sanity/ui@npm:1.9.3"
   dependencies:
@@ -7925,146 +6458,70 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-darwin-arm64@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-darwin-arm64@npm:1.3.96"
-=======
 "@swc/core-darwin-arm64@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-darwin-arm64@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-darwin-x64@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-darwin-x64@npm:1.3.96"
-=======
 "@swc/core-darwin-x64@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-darwin-x64@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-linux-arm-gnueabihf@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.96"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@swc/core-linux-arm64-gnu@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.96"
-=======
 "@swc/core-linux-arm64-gnu@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-linux-arm64-gnu@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-linux-arm64-musl@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.96"
-=======
 "@swc/core-linux-arm64-musl@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-linux-arm64-musl@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-linux-x64-gnu@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.96"
-=======
 "@swc/core-linux-x64-gnu@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-linux-x64-gnu@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-linux-x64-musl@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.96"
-=======
 "@swc/core-linux-x64-musl@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-linux-x64-musl@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-win32-arm64-msvc@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.96"
-=======
 "@swc/core-win32-arm64-msvc@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-win32-arm64-msvc@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-win32-ia32-msvc@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.96"
-=======
 "@swc/core-win32-ia32-msvc@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-win32-ia32-msvc@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@swc/core-win32-x64-msvc@npm:1.3.96":
-  version: 1.3.96
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.96"
-=======
 "@swc/core-win32-x64-msvc@npm:1.3.100":
   version: 1.3.100
   resolution: "@swc/core-win32-x64-msvc@npm:1.3.100"
->>>>>>> origin/main
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.82":
-<<<<<<< HEAD
-  version: 1.3.96
-  resolution: "@swc/core@npm:1.3.96"
-  dependencies:
-    "@swc/core-darwin-arm64": 1.3.96
-    "@swc/core-darwin-x64": 1.3.96
-    "@swc/core-linux-arm-gnueabihf": 1.3.96
-    "@swc/core-linux-arm64-gnu": 1.3.96
-    "@swc/core-linux-arm64-musl": 1.3.96
-    "@swc/core-linux-x64-gnu": 1.3.96
-    "@swc/core-linux-x64-musl": 1.3.96
-    "@swc/core-win32-arm64-msvc": 1.3.96
-    "@swc/core-win32-ia32-msvc": 1.3.96
-    "@swc/core-win32-x64-msvc": 1.3.96
-=======
   version: 1.3.100
   resolution: "@swc/core@npm:1.3.100"
   dependencies:
@@ -8077,7 +6534,6 @@ __metadata:
     "@swc/core-win32-arm64-msvc": 1.3.100
     "@swc/core-win32-ia32-msvc": 1.3.100
     "@swc/core-win32-x64-msvc": 1.3.100
->>>>>>> origin/main
     "@swc/counter": ^0.1.1
     "@swc/types": ^0.1.5
   peerDependencies:
@@ -8087,11 +6543,6 @@ __metadata:
       optional: true
     "@swc/core-darwin-x64":
       optional: true
-<<<<<<< HEAD
-    "@swc/core-linux-arm-gnueabihf":
-      optional: true
-=======
->>>>>>> origin/main
     "@swc/core-linux-arm64-gnu":
       optional: true
     "@swc/core-linux-arm64-musl":
@@ -8109,11 +6560,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-<<<<<<< HEAD
-  checksum: 41d4a4461b2952aaf8d3be945d373d0f3bd126115ee1aad0f76f2690e2b5635b6ec5bb54a7638deb9afedb1ad6f7d8453468a704e54e5fbb8234dd4a43b80205
-=======
   checksum: b68553db388c36b1859f0e8b5231a608277e17ae7fd7a928ea8b448432532176914f84675426d40aa9710617b2e7fb626aaa8358b6b2506b3c43f82db725c41e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8237,13 +6684,8 @@ __metadata:
   linkType: hard
 
 "@testing-library/jest-dom@npm:^6.1.2":
-<<<<<<< HEAD
-  version: 6.1.4
-  resolution: "@testing-library/jest-dom@npm:6.1.4"
-=======
   version: 6.1.5
   resolution: "@testing-library/jest-dom@npm:6.1.5"
->>>>>>> origin/main
   dependencies:
     "@adobe/css-tools": ^4.3.1
     "@babel/runtime": ^7.9.2
@@ -8267,11 +6709,7 @@ __metadata:
       optional: true
     vitest:
       optional: true
-<<<<<<< HEAD
-  checksum: c6bd9469554136a25d94b55ea16736d56b8c5d200526023774dbf35ca35551a721257e6734f1b404bbd07ae0a1950f1912b5be60e113db2ff2ff50af14f7085c
-=======
   checksum: 67f1433c7eb8649db6676df97d1144cf288e2d94c61e89531c05c587b56f2277454c558c97bcca567d5060ebd39caba5ba01d49dc57b3f005837477a401ad113
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8374,52 +6812,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14":
-  version: 7.20.2
-  resolution: "@types/babel__core@npm:7.20.2"
-=======
 "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.12, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.5":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
->>>>>>> origin/main
-  dependencies:
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-    "@types/babel__generator": "*"
-    "@types/babel__template": "*"
-    "@types/babel__traverse": "*"
-<<<<<<< HEAD
-  checksum: 564fbaa8ff1305d50807ada0ec227c3e7528bebb2f8fe6b2ed88db0735a31511a74ad18729679c43eeed8025ed29d408f53059289719e95ab1352ed559a100bd
-  languageName: node
-  linkType: hard
-
-"@types/babel__core@npm:^7.1.12":
-  version: 7.20.3
-  resolution: "@types/babel__core@npm:7.20.3"
-  dependencies:
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-    "@types/babel__generator": "*"
-    "@types/babel__template": "*"
-    "@types/babel__traverse": "*"
-  checksum: 8d14acc14d99b4b8bf36c00da368f6d597bd9ae3344aa7048f83f0f701b0463fa7c7bf2e50c3e4382fdbcfd1e4187b3452a0f0888b0f3ae8fad975591f7bdb94
-  languageName: node
-  linkType: hard
-
-"@types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.3":
-  version: 7.20.4
-  resolution: "@types/babel__core@npm:7.20.4"
   dependencies:
     "@babel/parser": ^7.20.7
     "@babel/types": ^7.20.7
     "@types/babel__generator": "*"
     "@types/babel__template": "*"
     "@types/babel__traverse": "*"
-  checksum: 75ed6072213423d2b827740d68bbf96f5a7050ce8bd842dde0ceec8d352d06e847166bac757df4beba55525b65f8727c0432adeb5cb4f83aa42e155ac555767e
-=======
   checksum: a3226f7930b635ee7a5e72c8d51a357e799d19cbf9d445710fa39ab13804f79ab1a54b72ea7d8e504659c7dfc50675db974b526142c754398d7413aa4bc30845
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8452,15 +6854,9 @@ __metadata:
   linkType: hard
 
 "@types/base64-url@npm:^2.2.0":
-<<<<<<< HEAD
-  version: 2.2.1
-  resolution: "@types/base64-url@npm:2.2.1"
-  checksum: c3392d50a466ddd72309c723ef090df02f172891f92dc64cd1067531538a4736c3da72cfe065130833cfd7caac0ae91bbf470fb72612fd05fc09ac200e626cd0
-=======
   version: 2.2.2
   resolution: "@types/base64-url@npm:2.2.2"
   checksum: 2991597ff57dab723b7e3f19e9d953a31e3b6b9cad55bcc6cc045a97be0b96e8fd67cd12403b842a6416cfa2a2b198f4abfba421b14ff83ef7cf3c32d780ce8b
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8475,55 +6871,30 @@ __metadata:
   linkType: hard
 
 "@types/bonjour@npm:^3.5.9":
-<<<<<<< HEAD
-  version: 3.5.12
-  resolution: "@types/bonjour@npm:3.5.12"
-  dependencies:
-    "@types/node": "*"
-  checksum: d8ef676a2386f09ced670e8a04f9ea77d29d05c406ac15db97820d6feb49b2bb65d9e951565b4f7f744e0585650cae59feea284c5a330214025f708ed43bb7f5
-=======
   version: 3.5.13
   resolution: "@types/bonjour@npm:3.5.13"
   dependencies:
     "@types/node": "*"
   checksum: e827570e097bd7d625a673c9c208af2d1a22fa3885c0a1646533cf24394c839c3e5f60ac1bc60c0ddcc69c0615078c9fb2c01b42596c7c582d895d974f2409ee
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/codemirror@npm:^5.60.5":
-<<<<<<< HEAD
-  version: 5.60.12
-  resolution: "@types/codemirror@npm:5.60.12"
-  dependencies:
-    "@types/tern": "*"
-  checksum: dff22f32ea42ccd3f9bfcf408631f94a11ffb4614ff4fa8cc55adf7da6e7ba96650533b8dd27d037242747bdaa85141e93520f84409db7bc394862a174a10e1e
-=======
   version: 5.60.15
   resolution: "@types/codemirror@npm:5.60.15"
   dependencies:
     "@types/tern": "*"
   checksum: cfad3f569de48fba3efa44fdfeba77933e231486a52cc80cff7ce6eeeed5b447a5bc2b11e2226bc00ccee332c661e53e35a15cf14eb835f434a6a402d9462f5f
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/connect-history-api-fallback@npm:^1.3.5":
-<<<<<<< HEAD
-  version: 1.5.2
-  resolution: "@types/connect-history-api-fallback@npm:1.5.2"
-  dependencies:
-    "@types/express-serve-static-core": "*"
-    "@types/node": "*"
-  checksum: 588934d2b4877df8a8460315fd6d911749334c59cf2eba6a0aa167c4fb9b8c6789c9d9a0f5118464953634a3efad89eeb19de7d65d619d917f3a1f8d98276672
-=======
   version: 1.5.4
   resolution: "@types/connect-history-api-fallback@npm:1.5.4"
   dependencies:
     "@types/express-serve-static-core": "*"
     "@types/node": "*"
   checksum: e1dee43b8570ffac02d2d47a2b4ba80d3ca0dd1840632dafb221da199e59dbe3778d3d7303c9e23c6b401f37c076935a5bc2aeae1c4e5feaefe1c371fe2073fd
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8537,32 +6908,18 @@ __metadata:
   linkType: hard
 
 "@types/cross-spawn@npm:^6.0.2":
-<<<<<<< HEAD
-  version: 6.0.5
-  resolution: "@types/cross-spawn@npm:6.0.5"
-  dependencies:
-    "@types/node": "*"
-  checksum: 9b9cf332e49319903df3abeeb91882730f26ef80eed2e5d5ab1feb432f3f0804f72a07296c305daf5a310e771d5e3bbfc5395f993ba17e35d399bf6996860771
-=======
   version: 6.0.6
   resolution: "@types/cross-spawn@npm:6.0.6"
   dependencies:
     "@types/node": "*"
   checksum: b4172927cd1387cf037c3ade785ef46c87537b7bc2803d7f6663b4904d0c5d6f726415d1adb2fee4fecb21746738f11336076449265d46be4ce110cc3a8c8436
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/dedent@npm:^0.7.0":
-<<<<<<< HEAD
-  version: 0.7.1
-  resolution: "@types/dedent@npm:0.7.1"
-  checksum: 13b4ce00e619bd5544d3e2a0f757586d4313b6b44702faa39b53c62eca0184971d75d8d8d4cb76fdcb7d9522905748a1cbd4f69e8194a50932268a832bf19425
-=======
   version: 0.7.2
   resolution: "@types/dedent@npm:0.7.2"
   checksum: 7c62900a4871ebc6ba19da77ad2e125a027c8f19516521004f5123f3bc22d129753b9251d22dee9bc748c1e7783cb7e86d496023b96971c94189b9d52e151876
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8619,21 +6976,12 @@ __metadata:
   linkType: hard
 
 "@types/eslint@npm:*":
-<<<<<<< HEAD
-  version: 8.44.7
-  resolution: "@types/eslint@npm:8.44.7"
-  dependencies:
-    "@types/estree": "*"
-    "@types/json-schema": "*"
-  checksum: 72a52f74477fbe7cc95ad290b491f51f0bc547cb7ea3672c68da3ffd3fb21ba86145bc36823a37d0a186caedeaee15b2d2a6b4c02c6c55819ff746053bd28310
-=======
   version: 8.44.8
   resolution: "@types/eslint@npm:8.44.8"
   dependencies:
     "@types/estree": "*"
     "@types/json-schema": "*"
   checksum: c3bc70166075e6e9f7fb43978882b9ac0b22596b519900b08dc8a1d761bbbddec4c48a60cc4eb674601266223c6f11db30f3fb6ceaae96c23c54b35ad88022bc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8686,23 +7034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/express-serve-static-core@npm:*":
-  version: 4.17.39
-  resolution: "@types/express-serve-static-core@npm:4.17.39"
-  dependencies:
-    "@types/node": "*"
-    "@types/qs": "*"
-    "@types/range-parser": "*"
-    "@types/send": "*"
-  checksum: 4227b96a53f0cf19d01fdb77a74252660f8e70650b79167e591b04c66ec9c7330d0a00038939415f96664a67312b21798bbac150fe81bf613380849b96546c37
-  languageName: node
-  linkType: hard
-
-"@types/express-serve-static-core@npm:^4.17.33":
-=======
 "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33":
->>>>>>> origin/main
   version: 4.17.41
   resolution: "@types/express-serve-static-core@npm:4.17.41"
   dependencies:
@@ -8714,23 +7046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/express@npm:*, @types/express@npm:^4.17.13":
-  version: 4.17.20
-  resolution: "@types/express@npm:4.17.20"
-  dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": ^4.17.33
-    "@types/qs": "*"
-    "@types/serve-static": "*"
-  checksum: bf8a97d283128e5129f9ccabbeef728ff3f0484465e0ae74a304bd0588fa6cb715ae68845650caba9a641944b7791ba125d02ddbd47a7e62aaefdd036570c6c5
-  languageName: node
-  linkType: hard
-
-"@types/express@npm:^4.7.0":
-=======
 "@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.7.0":
->>>>>>> origin/main
   version: 4.17.21
   resolution: "@types/express@npm:4.17.21"
   dependencies:
@@ -8776,19 +7092,11 @@ __metadata:
   linkType: hard
 
 "@types/hast@npm:^2.0.0":
-<<<<<<< HEAD
-  version: 2.3.7
-  resolution: "@types/hast@npm:2.3.7"
-  dependencies:
-    "@types/unist": ^2
-  checksum: 3e63332825ed88117e7f355ba0cfd35367f1d951a1c381333b56188f7645947c3bbbe96abb4c8239324ba1317fd241d5afdb42e104a3654a424327340d49052c
-=======
   version: 2.3.8
   resolution: "@types/hast@npm:2.3.8"
   dependencies:
     "@types/unist": ^2
   checksum: 4c3b3efb7067d32a568a9bf5d2a7599f99ec08c2eaade3aaeb579b7a31bcdf8f6475f56c1ac5bc3f4e4e07b84a93a9b1cf1ef9a8b52b39e3deabea7989e5dd4b
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8817,38 +7125,21 @@ __metadata:
   linkType: hard
 
 "@types/http-proxy@npm:^1.17.8":
-<<<<<<< HEAD
-  version: 1.17.13
-  resolution: "@types/http-proxy@npm:1.17.13"
-  dependencies:
-    "@types/node": "*"
-  checksum: 09e2d59db4689c46a6676496c355cac5499457ce61085121bfab64b8a825fde320574f22f981a8db3f1e9e977ddef55889f99da7f1ff485ac51f22b94308bf12
-=======
   version: 1.17.14
   resolution: "@types/http-proxy@npm:1.17.14"
   dependencies:
     "@types/node": "*"
   checksum: 491320bce3565bbb6c7d39d25b54bce626237cfb6b09e60ee7f77b56ae7c6cbad76f08d47fe01eaa706781124ee3dfad9bb737049254491efd98ed1f014c4e83
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/inquirer@npm:^9.0.3":
-<<<<<<< HEAD
-  version: 9.0.6
-  resolution: "@types/inquirer@npm:9.0.6"
-  dependencies:
-    "@types/through": "*"
-    rxjs: ^7.2.0
-  checksum: d4d55e986544ab2b336b1670b8e1395b86629081d2803d5247e3b1cf5643b7c67d6b15903da0a964087c6156c8457c8ae3245219eb991c4a8d8a03ce3e1cfee3
-=======
   version: 9.0.7
   resolution: "@types/inquirer@npm:9.0.7"
   dependencies:
     "@types/through": "*"
     rxjs: ^7.2.0
   checksum: c14c7a52797606a08ca7450d9263c01518b30e0b7610d0817fb530bc4fae7b3ffdcc9d50bb9f7befc2b220bb54195507cc423de3c8f320bbe9f7e5e8881a0226
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8862,15 +7153,9 @@ __metadata:
   linkType: hard
 
 "@types/is-hotkey@npm:^0.1.7, @types/is-hotkey@npm:^0.1.8":
-<<<<<<< HEAD
-  version: 0.1.9
-  resolution: "@types/is-hotkey@npm:0.1.9"
-  checksum: 4057a677e2300fdada016d8cd7e87d9a1fad9ca19ad7231e0df9884cb3cf1553df5e77e2e1e072441145a298cda274e057d07b3cef29b03dffbcec7cd4a18eee
-=======
   version: 0.1.10
   resolution: "@types/is-hotkey@npm:0.1.10"
   checksum: 9ecc49fb3822b3cfa8335132d54c6e577d0b14bb52d0bf1f817cdd19c442555b7523945e2ae72f6098e3c7f64b4777390f38afec3e4660343cfb471377e7fd82
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8900,21 +7185,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*, @types/jest@npm:^29.0.0":
-<<<<<<< HEAD
-  version: 29.5.7
-  resolution: "@types/jest@npm:29.5.7"
-  dependencies:
-    expect: ^29.0.0
-    pretty-format: ^29.0.0
-  checksum: e28624ccb0ef1255a03fbbb4b5bc3e5cbcdc450d39e0739985ff679b124198f808c38c8c3e67859c6efc0e848196deeb8cfed028e12a821c511dfc1112a2d6e9
-=======
   version: 29.5.11
   resolution: "@types/jest@npm:29.5.11"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
   checksum: f892a06ec9f0afa9a61cd7fa316ec614e21d4df1ad301b5a837787e046fcb40dfdf7f264a55e813ac6b9b633cb9d366bd5b8d1cea725e84102477b366df23fdd
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -8978,24 +7254,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/lodash@npm:*, @types/lodash@npm:^4.14.200":
-  version: 4.14.201
-  resolution: "@types/lodash@npm:4.14.201"
-  checksum: 484be655298e9b2dc2d218ea934071b2ea31e4a531c561dd220dbda65237e8d08c20dc2d457ac24f29be7fe167415bf7bb9360ea0d80bdb8b0f0ec8d8db92fae
-  languageName: node
-  linkType: hard
-
-"@types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.191":
-  version: 4.14.200
-  resolution: "@types/lodash@npm:4.14.200"
-  checksum: 6471f8bb5da692a6ecf03a8da4935bfbc341e67ee9bcb4f5730bfacff0c367232548f0a01e8ac5ea18c6fe78fb085d502494e33ccb47a7ee87cbdee03b47d00d
-=======
 "@types/lodash@npm:*, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.191, @types/lodash@npm:^4.14.200":
   version: 4.14.202
   resolution: "@types/lodash@npm:4.14.202"
   checksum: a91acf3564a568c6f199912f3eb2c76c99c5a0d7e219394294213b3f2d54f672619f0fde4da22b29dc5d4c31457cd799acc2e5cb6bd90f9af04a1578483b6ff7
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9021,28 +7283,16 @@ __metadata:
   linkType: hard
 
 "@types/mime@npm:*":
-<<<<<<< HEAD
-  version: 3.0.3
-  resolution: "@types/mime@npm:3.0.3"
-  checksum: d905a6b4736cc60fb56b39776b77ba0e10983d39f0aefc0034dc895b6ef90780e2f2e0a8c576539adb2963741a5aa67a6924d8940b0f7250f69e3e68a57f93b5
-=======
   version: 3.0.4
   resolution: "@types/mime@npm:3.0.4"
   checksum: a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/mime@npm:^1":
-<<<<<<< HEAD
-  version: 1.3.4
-  resolution: "@types/mime@npm:1.3.4"
-  checksum: d8670d2993773903e00fc0d7aa3254be2f8b384300ce3278999d057afbb80a5f71543d656d9d9725d691088c0b94e4acfca84359becf122cdf5942e53c9a75ce
-=======
   version: 1.3.5
   resolution: "@types/mime@npm:1.3.5"
   checksum: e29a5f9c4776f5229d84e525b7cd7dd960b51c30a0fb9a028c0821790b82fca9f672dab56561e2acd9e8eed51d431bde52eafdfef30f643586c4162f1aecfc78
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9077,14 +7327,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/node@npm:*":
-  version: 20.8.10
-  resolution: "@types/node@npm:20.8.10"
-  dependencies:
-    undici-types: ~5.26.4
-  checksum: 7c61190e43e8074a1b571e52ff14c880bc67a0447f2fe5ed0e1a023eb8a23d5f815658edb98890f7578afe0f090433c4a635c7c87311762544e20dd78723e515
-=======
 "@types/node-forge@npm:^1.3.0":
   version: 1.3.10
   resolution: "@types/node-forge@npm:1.3.10"
@@ -9100,7 +7342,6 @@ __metadata:
   dependencies:
     undici-types: ~5.26.4
   checksum: 054b296417e771ab524bea63cf3289559c6bdf290d45428f7cc68e9b00030ff7a0ece47b8c99a26b4f47a443919813bcf42beadff2f0bea7d8125fa541d92eb0
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9111,28 +7352,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@types/node@npm:^18.0.0":
-  version: 18.18.8
-  resolution: "@types/node@npm:18.18.8"
-  dependencies:
-    undici-types: ~5.26.4
-  checksum: d6a82bfc28bca8e4e32ffc9526798d1aea62f6993ea3a535cd3f47ac3f725a48efe3f484d68168dd154af0001c89935e4e1d77e7b1809c3824c6382bf99b86f6
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:^18.15.11":
-  version: 18.18.5
-  resolution: "@types/node@npm:18.18.5"
-  checksum: fc8c9b2bf226270cf9085a7dac76ce09dd7c3519ec9b687ee2b50385954ab3709c45ca82d002d1536e24286803cd194d7ab7008acebdcd6681b8b19d4277fa5c
-=======
 "@types/node@npm:^18.0.0, @types/node@npm:^18.15.11":
   version: 18.19.3
   resolution: "@types/node@npm:18.19.3"
   dependencies:
     undici-types: ~5.26.4
   checksum: 58c4fa45a78fcec75c78182a4b266395905957633654eb0311c5f9c30ac15c179ea2287ab1af034e46c2db7bb0589ef0000ee64c1de8f568a0aad29eaadb100c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9151,21 +7376,12 @@ __metadata:
   linkType: hard
 
 "@types/postcss-url@npm:^10.0.0":
-<<<<<<< HEAD
-  version: 10.0.2
-  resolution: "@types/postcss-url@npm:10.0.2"
-  dependencies:
-    "@types/node": "*"
-    postcss: ^8.0.0
-  checksum: 39933da26f678f92ba7d38232cf4c40deaac4d50cefc901f34840006511ba20699cb276c1c792b40eedaff9779b523e564807af21a14c79ee963eecd983152d8
-=======
   version: 10.0.3
   resolution: "@types/postcss-url@npm:10.0.3"
   dependencies:
     "@types/node": "*"
     postcss: ^8.0.0
   checksum: b90ca40bbed7dd19e8e86bea34860aa2aef9210fa451ba3e044996477173c5025b49ccda896972681bbd095c9571487289fe56a0a794c437fa6f72f654c4c814
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9177,156 +7393,80 @@ __metadata:
   linkType: hard
 
 "@types/pretty-hrtime@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.0.2
-  resolution: "@types/pretty-hrtime@npm:1.0.2"
-  checksum: 3c4e0e142d031348d4b6da7a86138e0a7dfefc5ace4adbfb73f2d71c437f212bc2a3714c1232328108bd3f7b5dc67d2b6affe1924f9d4a2d4907adf3ef0e6478
-=======
   version: 1.0.3
   resolution: "@types/pretty-hrtime@npm:1.0.3"
   checksum: 288061dff992c8107d5c7b5a1277bbb0a314a27eb10087dea628a08fa37694a655191a69e25a212c95e61e498363c48ad9e281d23964a448f6c14100a6be0910
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/prismjs@npm:^1.26.0":
-<<<<<<< HEAD
-  version: 1.26.2
-  resolution: "@types/prismjs@npm:1.26.2"
-  checksum: e2956744e3e4ccac3c986b3f46177a9468d71906a29878cc815c574906d71a54c604920306cfdfc2c8fea35ae512d0ce37a259e37f1086f1f23d9ef93e40648b
-=======
   version: 1.26.3
   resolution: "@types/prismjs@npm:1.26.3"
   checksum: c627fa9d9f4277ce413bb8347944152cddfc892702e34ff4b099dc1cf3f00c09514d36349c23529b903b0e57f3b2e0dc91ee66e98af07fbbe1e3fe8346b23370
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/prop-types@npm:*":
-<<<<<<< HEAD
-  version: 15.7.9
-  resolution: "@types/prop-types@npm:15.7.9"
-  checksum: c7591d3ff7593e243908a07e1d3e2bb6e8879008af5800d8378115a90d0fdf669a1cae72a6d7f69e59c4fa7bb4c8ed61f6ebc1c520fe110c6f2b03ac02414072
-=======
   version: 15.7.11
   resolution: "@types/prop-types@npm:15.7.11"
   checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/qs@npm:*, @types/qs@npm:^6.9.5":
-<<<<<<< HEAD
-  version: 6.9.9
-  resolution: "@types/qs@npm:6.9.9"
-  checksum: 03ddbd032bcaa8f07429efe9de6d0fc027ccdd1e24eac1656bd931c2210c204bbc25be0937a9d46702fb6262fb6ffcc2980e040b399b62a3f91ec6e387c2edae
-=======
   version: 6.9.10
   resolution: "@types/qs@npm:6.9.10"
   checksum: 3e479ee056bd2b60894baa119d12ecd33f20a25231b836af04654e784c886f28a356477630430152a86fba253da65d7ecd18acffbc2a8877a336e75aa0272c67
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/range-parser@npm:*":
-<<<<<<< HEAD
-  version: 1.2.6
-  resolution: "@types/range-parser@npm:1.2.6"
-  checksum: 22decf0fa30a5fb5b26b9d30052c8eca1dddf55449c87031c8d58a4e2e75c606d7bab6a1409988c96f774eb0ebf814147d47c76487d1d0d83441f1ab26bd5d6a
-=======
   version: 1.2.7
   resolution: "@types/range-parser@npm:1.2.7"
   checksum: 95640233b689dfbd85b8c6ee268812a732cf36d5affead89e806fe30da9a430767af8ef2cd661024fd97e19d61f3dec75af2df5e80ec3bea000019ab7028629a
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/react-copy-to-clipboard@npm:^5.0.2":
-<<<<<<< HEAD
-  version: 5.0.6
-  resolution: "@types/react-copy-to-clipboard@npm:5.0.6"
-  dependencies:
-    "@types/react": "*"
-  checksum: 0c2ee01bec5f9d4c9e2298e620ea325376124b183c7b0fd57a3f73bfa8d29a7f044fa5a885e91211e537f5c2d2ca1475b05d43c6d299145ef3599103adb1a04e
-=======
   version: 5.0.7
   resolution: "@types/react-copy-to-clipboard@npm:5.0.7"
   dependencies:
     "@types/react": "*"
   checksum: adc2970c8756e648daa06e294c422df3dc076a784344ab2ecb78a17ebd7e8e3dfd7f31e68c24267de4815cdeec573a743d952a308b45b8380f6b7912a9a8b911
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.0.9":
-<<<<<<< HEAD
-  version: 18.2.14
-  resolution: "@types/react-dom@npm:18.2.14"
-  dependencies:
-    "@types/react": "*"
-  checksum: 890289c70d1966c168037637c09cacefe6205bdd27a33252144a6b432595a2943775ac1a1accac0beddaeb67f8fdf721e076acb1adc990b08e51c3d9fd4e780c
-=======
   version: 18.2.17
   resolution: "@types/react-dom@npm:18.2.17"
   dependencies:
     "@types/react": "*"
   checksum: 7a4e704ed4be6e0c3ccd8a22ff69386fe548304bf4db090513f42e059ff4c65f7a427790320051524d6578a2e4c9667bb7a80a4c989b72361c019fbe851d9385
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/react-is@npm:^18.2.0":
-<<<<<<< HEAD
-  version: 18.2.3
-  resolution: "@types/react-is@npm:18.2.3"
-  dependencies:
-    "@types/react": "*"
-  checksum: 14d3b659bee8c7444faae3c3d8f04e30dad555a203f2c255a9eef027f71dd55f5d50b05eca0ec2097acfe5da4632bdb8816993f9c3e4ca3c0e3d1a6ad1f07993
-=======
   version: 18.2.4
   resolution: "@types/react-is@npm:18.2.4"
   dependencies:
     "@types/react": "*"
   checksum: 2b69293a04609641be4963f5a9127aba3b7576cc15e3234fe6c341a940cbf3979e80bf848a43d93a24fb2ab09ad8faed54ac38c22037b159a0eea852e4dfa6eb
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/react-redux@npm:^7.1.20":
-<<<<<<< HEAD
-  version: 7.1.29
-  resolution: "@types/react-redux@npm:7.1.29"
-=======
   version: 7.1.32
   resolution: "@types/react-redux@npm:7.1.32"
->>>>>>> origin/main
   dependencies:
     "@types/hoist-non-react-statics": ^3.3.0
     "@types/react": "*"
     hoist-non-react-statics: ^3.3.0
     redux: ^4.0.0
-<<<<<<< HEAD
-  checksum: 74041cfdce9588e4999657c616f7e3c81661850789131582935df80f634907565d498fc26b680659220524cd8bb74141a9c3444caab92536268cee9dcde01f3f
-=======
   checksum: f09eeb27956914ce40451c2581db3dc18cabe50bebbe111230b45635894e93c6547dead5589319bf66e7e99cc1687497020bddc5c9fd336041e0eac3f9a966dd
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/react-transition-group@npm:^4.4.0":
-<<<<<<< HEAD
-  version: 4.4.8
-  resolution: "@types/react-transition-group@npm:4.4.8"
-  dependencies:
-    "@types/react": "*"
-  checksum: ad7ba2bce97631fda9d89b4ed9772489bd050fec3ccd7563041b206dbe219d37d22e0d7731b1f90f56e89daf40e69ba16beba8066c42165bf8a584533feb6a2c
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.0.0, @types/react@npm:^18.0.25":
-  version: 18.2.36
-  resolution: "@types/react@npm:18.2.36"
-=======
   version: 4.4.10
   resolution: "@types/react-transition-group@npm:4.4.10"
   dependencies:
@@ -9338,57 +7478,27 @@ __metadata:
 "@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.0.0, @types/react@npm:^18.0.25, @types/react@npm:^18.0.26":
   version: 18.2.42
   resolution: "@types/react@npm:18.2.42"
->>>>>>> origin/main
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-<<<<<<< HEAD
-  checksum: 561fab294117983f3d245a63730bcffb423fc2a1b0f27d20c870abc5d980bc206a74f741cb11b5170fcdf0e747ac05448369cd930fbf345f74ed567f8fef3a9e
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:^18.0.26":
-  version: 18.2.31
-  resolution: "@types/react@npm:18.2.31"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: b11be8e39174d3303e308461400889e353e422d22b01d09795b2c35b7b99d5351716503d9ec5c58e4c2c871249603fa52840d45a34fb5901dd7a26e06129c716
-=======
   checksum: d2019afdf48303a3a598a97cc9dd2284e3c04b369e791f6ba3c33232b7f8645daff97b093a19f8b3ce75ac8a261b47552cb4513226ab16d843eb9443b0f91844
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/resolve@npm:^1.20.2":
-<<<<<<< HEAD
-  version: 1.20.4
-  resolution: "@types/resolve@npm:1.20.4"
-  checksum: d9ddf2a9231df86dd0e98046df531ac63d96d3a97db635d00a25f33520535d0679a2c451751fe26a2221e209c91f6d03286f8c6595bf5f71eddc3d7a7c64ee3f
-=======
   version: 1.20.6
   resolution: "@types/resolve@npm:1.20.6"
   checksum: dc35f5517606b6687cd971c0281ac58bdee2c50c051b030f04647d3991688be2259c304ee97e5b5d4b9936072c36767eb5933b54611a407d6557972bb6fea4f6
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/responselike@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.0.2
-  resolution: "@types/responselike@npm:1.0.2"
-  dependencies:
-    "@types/node": "*"
-  checksum: ff1767e947eb7d49849e4566040453efcd894888e85b398f7f8cb731552f303f26aceda573b680a142b77ec5fb6c79535d9c6d047d9f936c386dbf3863d2ae17
-=======
   version: 1.0.3
   resolution: "@types/responselike@npm:1.0.3"
   dependencies:
     "@types/node": "*"
   checksum: 6ac4b35723429b11b117e813c7acc42c3af8b5554caaf1fc750404c1ae59f9b7376bc69b9e9e194a5a97357a597c2228b7173d317320f0360d617b6425212f58
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9400,170 +7510,92 @@ __metadata:
   linkType: hard
 
 "@types/scheduler@npm:*":
-<<<<<<< HEAD
-  version: 0.16.5
-  resolution: "@types/scheduler@npm:0.16.5"
-  checksum: 5aae67331bb7877edc65f77f205fb03c3808d9e51c186afe26945ce69f4072886629580a751e9ce8573e4a7538d0dfa1e4ce388c7c451fa689a4c592fdf1ea45
-=======
   version: 0.16.8
   resolution: "@types/scheduler@npm:0.16.8"
   checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0":
-<<<<<<< HEAD
-  version: 7.5.4
-  resolution: "@types/semver@npm:7.5.4"
-  checksum: 120c0189f6fec5f2d12d0d71ac8a4cfa952dc17fa3d842e8afddb82bba8828a4052f8799c1653e2b47ae1977435f38e8985658fde971905ce5afb8e23ee97ecf
-=======
   version: 7.5.6
   resolution: "@types/semver@npm:7.5.6"
   checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/send@npm:*":
-<<<<<<< HEAD
-  version: 0.17.3
-  resolution: "@types/send@npm:0.17.3"
-  dependencies:
-    "@types/mime": ^1
-    "@types/node": "*"
-  checksum: 2162f917f1015e7218b8a1f51a70c16ae647e1c4e16f940acae9fb326455d6031b33b3868b40bda8ba8d3d577013f64176f30a37f1a2aa3ce4f999a808f34397
-=======
   version: 0.17.4
   resolution: "@types/send@npm:0.17.4"
   dependencies:
     "@types/mime": ^1
     "@types/node": "*"
   checksum: cf4db48251bbb03cd6452b4de6e8e09e2d75390a92fd798eca4a803df06444adc94ed050246c94c7ed46fb97be1f63607f0e1f13c3ce83d71788b3e08640e5e0
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/serve-index@npm:^1.9.1":
-<<<<<<< HEAD
-  version: 1.9.3
-  resolution: "@types/serve-index@npm:1.9.3"
-  dependencies:
-    "@types/express": "*"
-  checksum: 792b8629e5bec1513398727fbeb17c87ebbcb0462a7193ad92bca3e746e4f581c7c6b077365cb40e73b25179d6b335ad5b6224bd0374534eea55df89b101d5ef
-=======
   version: 1.9.4
   resolution: "@types/serve-index@npm:1.9.4"
   dependencies:
     "@types/express": "*"
   checksum: 72727c88d54da5b13275ebfb75dcdc4aa12417bbe9da1939e017c4c5f0c906fae843aa4e0fbfe360e7ee9df2f3d388c21abfc488f77ce58693fb57809f8ded92
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10":
-<<<<<<< HEAD
-  version: 1.15.4
-  resolution: "@types/serve-static@npm:1.15.4"
-=======
   version: 1.15.5
   resolution: "@types/serve-static@npm:1.15.5"
->>>>>>> origin/main
   dependencies:
     "@types/http-errors": "*"
     "@types/mime": "*"
     "@types/node": "*"
-<<<<<<< HEAD
-  checksum: e2e71916d262cac05fa36c3178c3bcc5c0f2fb801f9dc3c4ee58864b7b2bd69b6fb0e312f60e3f19e0ba7206ea57964652a4a3251125121a463acb34dfc9f636
-=======
   checksum: 0ff4b3703cf20ba89c9f9e345bc38417860a88e85863c8d6fe274a543220ab7f5f647d307c60a71bb57dc9559f0890a661e8dc771a6ec5ef195d91c8afc4a893
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/shallow-equals@npm:^1.0.0":
-<<<<<<< HEAD
-  version: 1.0.2
-  resolution: "@types/shallow-equals@npm:1.0.2"
-  checksum: 9a6888b9db04ad9d894429e0a7a104af98b76cb24e0105512ff3a63edcbf9c097e5260ced6bd992ab2df93fadf658e8c942e3cd522c3fac848706d9b8c85c9fb
-=======
   version: 1.0.3
   resolution: "@types/shallow-equals@npm:1.0.3"
   checksum: 3c3c730ee2b37465b4ac0c5ad334229a95bde8bb48f3a5d19753514183babb446f9d30cc7ab23420963b7d21a6326a6d3da0a3066236256c062f2875f3d87b65
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/sockjs@npm:^0.3.33":
-<<<<<<< HEAD
-  version: 0.3.35
-  resolution: "@types/sockjs@npm:0.3.35"
-  dependencies:
-    "@types/node": "*"
-  checksum: 829b6bbe155f4320a57429bcc3b87aedfec7ee0bd055d46ab021bed676fba0210600ad22d516fe3ae5b3989c2a2c892f2b95d47eb5e41e71ca48954b7abab79d
-=======
   version: 0.3.36
   resolution: "@types/sockjs@npm:0.3.36"
   dependencies:
     "@types/node": "*"
   checksum: b4b5381122465d80ea8b158537c00bc82317222d3fb31fd7229ff25b31fa89134abfbab969118da55622236bf3d8fee75759f3959908b5688991f492008f29bc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/speakingurl@npm:^13.0.3":
-<<<<<<< HEAD
-  version: 13.0.5
-  resolution: "@types/speakingurl@npm:13.0.5"
-  checksum: 66b6ee271a684658be9e36625aa72fcc685ea329306f143e36b344cd55295cf384376a1d8942664d610153993b78acf66e06fe217b0e104a131204145b6747cb
-=======
   version: 13.0.6
   resolution: "@types/speakingurl@npm:13.0.6"
   checksum: 63d30bfed810249c6d54303a9ed6406e9bb6bd19f303f5f23a3abd7bb72c25e74846a9d19438d75b084c77b5546ca8604a4a404e357d6cce56605492ddeccb2a
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/stack-utils@npm:^2.0.0":
-<<<<<<< HEAD
-  version: 2.0.2
-  resolution: "@types/stack-utils@npm:2.0.2"
-  checksum: 777cc7ac0c1000c5a07561013bcf7bd8477a3d55f55f376ee2f0c586331f7b999f57788140cfbdb65f6d7d97c0c41fe8fe6c778fd3ed71859c9b681ea76fc621
-=======
   version: 2.0.3
   resolution: "@types/stack-utils@npm:2.0.3"
   checksum: 72576cc1522090fe497337c2b99d9838e320659ac57fa5560fcbdcbafcf5d0216c6b3a0a8a4ee4fdb3b1f5e3420aa4f6223ab57b82fef3578bec3206425c6cf5
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/stylis@npm:^4.0.2":
-<<<<<<< HEAD
-  version: 4.2.2
-  resolution: "@types/stylis@npm:4.2.2"
-  checksum: 8cd30200c4d541664344d66240793641246f6f79239b985d1879c6ff271c569e053b4823d594bbb302d8c697d77582988bd27c0317ebbf2cb6594d22206245e3
-=======
   version: 4.2.4
   resolution: "@types/stylis@npm:4.2.4"
   checksum: 0734b4136192f97f4c8792ea41f1293091dfda53434ede08281fa42689d31f16cd1ad0e058de88c11980c18aae29e62a87027b235b98ab0cb237641b6ec44bcb
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/tern@npm:*":
-<<<<<<< HEAD
-  version: 0.23.6
-  resolution: "@types/tern@npm:0.23.6"
-  dependencies:
-    "@types/estree": "*"
-  checksum: 8af409516bffa8221096aa77833838926b6f94030e2476b6f651bcc3bc9d7beac1c1ab762c09b2e8664d70816e921588fe3e63bf9ddeddd427a4a6a1c25dceff
-=======
   version: 0.23.9
   resolution: "@types/tern@npm:0.23.9"
   dependencies:
     "@types/estree": "*"
   checksum: 53f229c79edf9454011f5b37c8539e0e760a130beac953d4e2126823de1ac6b0e2a45612596679fb232ec861826584fcaa272e2254a890b410575683423d56a8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9577,45 +7609,25 @@ __metadata:
   linkType: hard
 
 "@types/through@npm:*":
-<<<<<<< HEAD
-  version: 0.0.32
-  resolution: "@types/through@npm:0.0.32"
-  dependencies:
-    "@types/node": "*"
-  checksum: dd0e45434bca5851c8358dd7e8d0156708d736a34ce261f030a8d2103a89cac662a434cb85016263505fe00de8b4b9f50b8d84e2e51792621b398dd6e2953375
-=======
   version: 0.0.33
   resolution: "@types/through@npm:0.0.33"
   dependencies:
     "@types/node": "*"
   checksum: fd0b73f873a64ed5366d1d757c42e5dbbb2201002667c8958eda7ca02fff09d73de91360572db465ee00240c32d50c6039ea736d8eca374300f9664f93e8da39
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/tough-cookie@npm:*":
-<<<<<<< HEAD
-  version: 4.0.4
-  resolution: "@types/tough-cookie@npm:4.0.4"
-  checksum: 6be275b09f5fbf33f359fd6d5372c69357cf96dea5d7ba7a6563c76c6cce8b0c7f81caa4805810b0e67427cad381aeef00d8c060d614fee79ca245c2b9887c3a
-=======
   version: 4.0.5
   resolution: "@types/tough-cookie@npm:4.0.5"
   checksum: f19409d0190b179331586365912920d192733112a195e870c7f18d20ac8adb7ad0b0ff69dad430dba8bc2be09593453a719cfea92dc3bda19748fd158fe1498d
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/unist@npm:^2, @types/unist@npm:^2.0.0":
-<<<<<<< HEAD
-  version: 2.0.9
-  resolution: "@types/unist@npm:2.0.9"
-  checksum: 53e63a9ecebc8dca8b9dbc69cd0369ea0c993188ebb6e3b41c222281b4e95d8e0b524bcb1556fd210ea7f39771551be0c1c8fe0000bdcc0cd184cd2cd2794256
-=======
   version: 2.0.10
   resolution: "@types/unist@npm:2.0.10"
   checksum: e2924e18dedf45f68a5c6ccd6015cd62f1643b1b43baac1854efa21ae9e70505db94290434a23da1137d9e31eb58e54ca175982005698ac37300a1c889f6c4aa
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9641,80 +7653,40 @@ __metadata:
   linkType: hard
 
 "@types/ws@npm:^8.5.5":
-<<<<<<< HEAD
-  version: 8.5.8
-  resolution: "@types/ws@npm:8.5.8"
-  dependencies:
-    "@types/node": "*"
-  checksum: 4ad30de842834d4dd8e6e1476470752709d4165352a3a36780f23f4fdb686d4ac8ca5e16a0e0622940ddace910b856ff8a0baa2e24e41d204fb7a6a02ab2172b
-=======
   version: 8.5.10
   resolution: "@types/ws@npm:8.5.10"
   dependencies:
     "@types/node": "*"
   checksum: 3ec416ea2be24042ebd677932a462cf16d2080393d8d7d0b1b3f5d6eaa4a7387aaf0eefb99193c0bfd29444857cf2e0c3ac89899e130550dc6c14ada8a46d25e
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/yargs-parser@npm:*":
-<<<<<<< HEAD
-  version: 21.0.2
-  resolution: "@types/yargs-parser@npm:21.0.2"
-  checksum: e979051aac91d778fdb3953aced8cf039d954c3936b910b57735b7b52a413d065e6b2aea1cb2c583f6c23296a6f8543d2541879d798f0afedd7409a562b7bdeb
-=======
   version: 21.0.3
   resolution: "@types/yargs-parser@npm:21.0.3"
   checksum: ef236c27f9432983e91432d974243e6c4cdae227cb673740320eff32d04d853eed59c92ca6f1142a335cfdc0e17cccafa62e95886a8154ca8891cc2dec4ee6fc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/yargs@npm:^16.0.0":
-<<<<<<< HEAD
-  version: 16.0.7
-  resolution: "@types/yargs@npm:16.0.7"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: b116b9a3f3fc0ed608f2413fc3c48ba90344761d0c160ca6a31edf669959325172594f706cb85f9c1c46c5cf33130ff6b5772143c37567a24689489976a5d248
-=======
   version: 16.0.9
   resolution: "@types/yargs@npm:16.0.9"
   dependencies:
     "@types/yargs-parser": "*"
   checksum: 00d9276ed4e0f17a78c1ed57f644a8c14061959bd5bfab113d57f082ea4b663ba97f71b89371304a34a2dba5061e9ae4523e357e577ba61834d661f82c223bf8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@types/yargs@npm:^17.0.8":
-<<<<<<< HEAD
-  version: 17.0.30
-  resolution: "@types/yargs@npm:17.0.30"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: 62d9e23923420a7353253512b45289a1928d5eeb073bb2fee947257ba41fcc5bc6f78b9e087162ea2e00c7e98d27d043ef85615ad856f0d7def5c6d60f610e58
-=======
   version: 17.0.32
   resolution: "@types/yargs@npm:17.0.32"
   dependencies:
     "@types/yargs-parser": "*"
   checksum: 4505bdebe8716ff383640c6e928f855b5d337cb3c68c81f7249fc6b983d0aa48de3eee26062b84f37e0d75a5797bc745e0c6e76f42f81771252a758c638f36ba
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@typescript-eslint/eslint-plugin@npm:^6.7.3":
-<<<<<<< HEAD
-  version: 6.10.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.10.0"
-  dependencies:
-    "@eslint-community/regexpp": ^4.5.1
-    "@typescript-eslint/scope-manager": 6.10.0
-    "@typescript-eslint/type-utils": 6.10.0
-    "@typescript-eslint/utils": 6.10.0
-    "@typescript-eslint/visitor-keys": 6.10.0
-=======
   version: 6.13.2
   resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2"
   dependencies:
@@ -9723,7 +7695,6 @@ __metadata:
     "@typescript-eslint/type-utils": 6.13.2
     "@typescript-eslint/utils": 6.13.2
     "@typescript-eslint/visitor-keys": 6.13.2
->>>>>>> origin/main
     debug: ^4.3.4
     graphemer: ^1.4.0
     ignore: ^5.2.4
@@ -9736,24 +7707,11 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-<<<<<<< HEAD
-  checksum: eaf1f66ae1915426dad8d229c8cb80d2b320572a30c3fbc57d560d40edc2d17d004101a2fcbe331bc458df19a00f8b705f2442ee02e028bb595f4e9f9152e99d
-=======
   checksum: e50cbbe7104eecef59faf3355ab981d9f353b19327f0b4607dfd829b4726f9e694b536fe43ab55f50bb00fbfdd2e4268a7e2a568b28d5fcd0d2a32a8d2466218
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@typescript-eslint/parser@npm:^6.7.3":
-<<<<<<< HEAD
-  version: 6.10.0
-  resolution: "@typescript-eslint/parser@npm:6.10.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": 6.10.0
-    "@typescript-eslint/types": 6.10.0
-    "@typescript-eslint/typescript-estree": 6.10.0
-    "@typescript-eslint/visitor-keys": 6.10.0
-=======
   version: 6.13.2
   resolution: "@typescript-eslint/parser@npm:6.13.2"
   dependencies:
@@ -9761,18 +7719,13 @@ __metadata:
     "@typescript-eslint/types": 6.13.2
     "@typescript-eslint/typescript-estree": 6.13.2
     "@typescript-eslint/visitor-keys": 6.13.2
->>>>>>> origin/main
     debug: ^4.3.4
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-<<<<<<< HEAD
-  checksum: c4b140932d639b3f3eac892497aa700bcc9101ef268285020757dc9bee670d122de107e936320af99a5c06569e4eb93bccf87f14a9970ceab708c432e748423a
-=======
   checksum: aeafc414d295d7855384f10d57abb4f5f2ff35b57991b5c8854f43268761b3cc995e62af585dea1dc48295d762f466b565b5ae5699bfe642585d3f83ba8e1515
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9786,24 +7739,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@typescript-eslint/scope-manager@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.10.0"
-  dependencies:
-    "@typescript-eslint/types": 6.10.0
-    "@typescript-eslint/visitor-keys": 6.10.0
-  checksum: c9b9483082ae853f10b888cf04d4a14f666ac55e749bfdb7b7f726fc51127a6340b5e2f50d93f134a8854ddcc41f7b116b214753251a8b033d0d84c600439c54
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/type-utils@npm:6.10.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": 6.10.0
-    "@typescript-eslint/utils": 6.10.0
-=======
 "@typescript-eslint/scope-manager@npm:6.13.2":
   version: 6.13.2
   resolution: "@typescript-eslint/scope-manager@npm:6.13.2"
@@ -9820,7 +7755,6 @@ __metadata:
   dependencies:
     "@typescript-eslint/typescript-estree": 6.13.2
     "@typescript-eslint/utils": 6.13.2
->>>>>>> origin/main
     debug: ^4.3.4
     ts-api-utils: ^1.0.1
   peerDependencies:
@@ -9828,11 +7762,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-<<<<<<< HEAD
-  checksum: cfe9520cf0c0f50b115d2591acb2abf99ffe5789b3536268ca65b624c8498812d91f187e80c41bea7cf2cebad9c38f69ef27440f872a20fb53c59856d8f5df38
-=======
   checksum: ba54e5746139f778c35e4058e523ec8c20b68cf6472b3a7784170328e48c228f0761d2fc7e43dab053ca7d85ac4378b6965567774e6afedf551e600638404215
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9850,17 +7780,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@typescript-eslint/types@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/types@npm:6.10.0"
-  checksum: e63a9e05eb3d736d02a09131627d5cb89394bf0d9d6b46fb4b620be902d89d73554720be65acbc194787bff9ffcd518c9a6cf88fd63e418232b4181e8d8438df
-=======
 "@typescript-eslint/types@npm:6.13.2":
   version: 6.13.2
   resolution: "@typescript-eslint/types@npm:6.13.2"
   checksum: 4493ff06fa07c68c5adbcbd842f6dd6f5c88f14d160b53c3379b6b703e6f62808fab7fdebcc06ff06a56f20ab432b6ceeb0afb8931dc97d4061cb417e787f2c1
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -9900,21 +7823,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@typescript-eslint/typescript-estree@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.10.0"
-  dependencies:
-    "@typescript-eslint/types": 6.10.0
-    "@typescript-eslint/visitor-keys": 6.10.0
-=======
 "@typescript-eslint/typescript-estree@npm:6.13.2":
   version: 6.13.2
   resolution: "@typescript-eslint/typescript-estree@npm:6.13.2"
   dependencies:
     "@typescript-eslint/types": 6.13.2
     "@typescript-eslint/visitor-keys": 6.13.2
->>>>>>> origin/main
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -9923,15 +7837,6 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-<<<<<<< HEAD
-  checksum: 15bd8d9239a557071d6b03e7aa854b769fcc2dbdff587ed94be7ee8060dabdb05bcae4251df22432f625f82087e7f6986e9aab04f7eea35af694d4edd76a21af
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/utils@npm:6.10.0"
-=======
   checksum: 0c18ee5ef594a2411a788fe9d7bc6d51a03bce38d9d764bcb24ab557e5bc1942c2ddf9bd6fb4877eb102b0ae488974fb7b7fe72daa70a2054bf04d3cc6803546
   languageName: node
   linkType: hard
@@ -9939,20 +7844,10 @@ __metadata:
 "@typescript-eslint/utils@npm:6.13.2":
   version: 6.13.2
   resolution: "@typescript-eslint/utils@npm:6.13.2"
->>>>>>> origin/main
   dependencies:
     "@eslint-community/eslint-utils": ^4.4.0
     "@types/json-schema": ^7.0.12
     "@types/semver": ^7.5.0
-<<<<<<< HEAD
-    "@typescript-eslint/scope-manager": 6.10.0
-    "@typescript-eslint/types": 6.10.0
-    "@typescript-eslint/typescript-estree": 6.10.0
-    semver: ^7.5.4
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: b6bd4d68623fb8d616ae63a88f2954258411a0cc113029fba801d1e74b4c0319fdfbcac0070527afe5cc38c012c8718e4faecd1603000924d7b89e8fefc3f24d
-=======
     "@typescript-eslint/scope-manager": 6.13.2
     "@typescript-eslint/types": 6.13.2
     "@typescript-eslint/typescript-estree": 6.13.2
@@ -9960,7 +7855,6 @@ __metadata:
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   checksum: b66bcf2a945e9c55f3dccb48af49565863d974837ee23b2f01ce7f3fb2462eb8a5871784d4a2fcc80dac7d5cd4ed90c8d01431cd177c0249de89a448f6663fc8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -10002,21 +7896,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@typescript-eslint/visitor-keys@npm:6.10.0":
-  version: 6.10.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.10.0"
-  dependencies:
-    "@typescript-eslint/types": 6.10.0
-    eslint-visitor-keys: ^3.4.1
-  checksum: 9640bfae41e6109ffba31e68b1720382de0538d021261e2fc9e514c83c703084393c0818ca77ed26b950273e45e593371120281e8d4bbd09cb8c2d46c9fe4f03
-  languageName: node
-  linkType: hard
-
-"@uiw/codemirror-extensions-basic-setup@npm:4.21.20":
-  version: 4.21.20
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.21.20"
-=======
 "@typescript-eslint/visitor-keys@npm:6.13.2":
   version: 6.13.2
   resolution: "@typescript-eslint/visitor-keys@npm:6.13.2"
@@ -10030,7 +7909,6 @@ __metadata:
 "@uiw/codemirror-extensions-basic-setup@npm:4.21.21":
   version: 4.21.21
   resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.21.21"
->>>>>>> origin/main
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -10047,22 +7925,13 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-<<<<<<< HEAD
-  checksum: 76a6caf05bbcf06c515c680ab952e79b8470ca10c9d8c3166fdb05310232239782b170da276b1dbf33900ca894332fc2aba3bd6955665b2c2580548c7e17cbc0
-=======
   checksum: 5d96ec930be286b5e324ee8dd57128171c72a8e333b4b991a5c4f33a05420a638def3776bd1a77c5b88184f7d3cbc6828b5c9a42b3b490f51908bedf69eaa0f0
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@uiw/codemirror-themes@npm:^4.19.4":
-<<<<<<< HEAD
-  version: 4.21.20
-  resolution: "@uiw/codemirror-themes@npm:4.21.20"
-=======
   version: 4.21.21
   resolution: "@uiw/codemirror-themes@npm:4.21.21"
->>>>>>> origin/main
   dependencies:
     "@codemirror/language": ^6.0.0
     "@codemirror/state": ^6.0.0
@@ -10071,32 +7940,19 @@ __metadata:
     "@codemirror/language": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-<<<<<<< HEAD
-  checksum: 883fe8810daa2cf13e2f0b3812ac7653b2df0a91df74564fbe19d09eeb535ff2a5a9e5a9477168e2fef1aef8a993099fce6c1862e8d181778e2f76e3576f16af
-=======
   checksum: 3d3d791048a4eed8b5f62c7c89990407615ef6597b7aacfc2506a53e3e3b9b523c867bbc711e6d73cd713f353461073273a0ee055b0e94c69b11c1dbb53ae97f
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.11.4, @uiw/react-codemirror@npm:^4.19.4":
-<<<<<<< HEAD
-  version: 4.21.20
-  resolution: "@uiw/react-codemirror@npm:4.21.20"
-=======
   version: 4.21.21
   resolution: "@uiw/react-codemirror@npm:4.21.21"
->>>>>>> origin/main
   dependencies:
     "@babel/runtime": ^7.18.6
     "@codemirror/commands": ^6.1.0
     "@codemirror/state": ^6.1.1
     "@codemirror/theme-one-dark": ^6.0.0
-<<<<<<< HEAD
-    "@uiw/codemirror-extensions-basic-setup": 4.21.20
-=======
     "@uiw/codemirror-extensions-basic-setup": 4.21.21
->>>>>>> origin/main
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -10106,11 +7962,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-<<<<<<< HEAD
-  checksum: 63ea348a922c535ff91c8bff1c1dac40ced0227d1c17139142dbc28017bb254cc32428a15686660ec4f4cd6935c574d627b6a4872910357af51da8e90faaf4da
-=======
   checksum: 6a8500290bf0a739fd345221465b10112e0f758914bc8aa28ce0b9904b76489ae018d390f6a2d7dd7752b21f0ed87ba3fedb45b4185d04e4985abf0eb22e6d75
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -10129,20 +7981,11 @@ __metadata:
   linkType: hard
 
 "@vanilla-extract/css@npm:^1.7.2, @vanilla-extract/css@npm:^1.9.2":
-<<<<<<< HEAD
-  version: 1.13.0
-  resolution: "@vanilla-extract/css@npm:1.13.0"
-  dependencies:
-    "@emotion/hash": ^0.9.0
-    "@vanilla-extract/private": ^1.0.3
-    ahocorasick: 1.0.2
-=======
   version: 1.14.0
   resolution: "@vanilla-extract/css@npm:1.14.0"
   dependencies:
     "@emotion/hash": ^0.9.0
     "@vanilla-extract/private": ^1.0.3
->>>>>>> origin/main
     chalk: ^4.1.1
     css-what: ^6.1.0
     cssesc: ^3.0.0
@@ -10150,14 +7993,9 @@ __metadata:
     deep-object-diff: ^1.1.9
     deepmerge: ^4.2.2
     media-query-parser: ^2.0.2
-<<<<<<< HEAD
-    outdent: ^0.8.0
-  checksum: 35c88718d451cb71e16a2cc0ece045e51cc84f8da29f92c4cbd6bff333d2fd35a724e95c1affd9d9df9ac67c9a18a53853e79afb8bbae70f2396ba5bbece2b16
-=======
     modern-ahocorasick: ^1.0.0
     outdent: ^0.8.0
   checksum: ca12de26f72b908c7ac2ee9319faff885fb451ab3da7cef86aae8660c7e042c447041be40ac8c6155d87e8a709efb0697214db3a6cce211e8ef3c110d4dcf8a1
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -10229,19 +8067,6 @@ __metadata:
   linkType: hard
 
 "@vitejs/plugin-react@npm:^4.0.0":
-<<<<<<< HEAD
-  version: 4.1.1
-  resolution: "@vitejs/plugin-react@npm:4.1.1"
-  dependencies:
-    "@babel/core": ^7.23.2
-    "@babel/plugin-transform-react-jsx-self": ^7.22.5
-    "@babel/plugin-transform-react-jsx-source": ^7.22.5
-    "@types/babel__core": ^7.20.3
-    react-refresh: ^0.14.0
-  peerDependencies:
-    vite: ^4.2.0
-  checksum: 275132ab1e4c227326396aeee93084f20bbe5f0fbe92d45813f3eacd0766eb6e8cd83ee222f90411aefad1ce60fbd31766a8e4725e7bb36914f2bba37afbdebf
-=======
   version: 4.2.1
   resolution: "@vitejs/plugin-react@npm:4.2.1"
   dependencies:
@@ -10253,7 +8078,6 @@ __metadata:
   peerDependencies:
     vite: ^4.2.0 || ^5.0.0
   checksum: 08d227d27ff2304e395e746bd2d4b5fee40587f69d7e2fcd6beb7d91163c1f1dc26d843bc48e2ffb8f38c6b8a1b9445fb07840e3dcc841f97b56bbb8205346aa
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -10558,15 +8382,9 @@ __metadata:
   linkType: hard
 
 "acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
-<<<<<<< HEAD
-  version: 8.3.0
-  resolution: "acorn-walk@npm:8.3.0"
-  checksum: 15ea56ab6529135be05e7d018f935ca80a572355dd3f6d3cd717e36df3346e0f635a93ae781b1c7942607693e2e5f3ef81af5c6fc697bbadcc377ebda7b7f5f6
-=======
   version: 8.3.1
   resolution: "acorn-walk@npm:8.3.1"
   checksum: 5c8926ddb5400bc825b6baca782931f9df4ace603ba1a517f5243290fd9cdb089d52877840687b5d5c939591ebc314e2e63721514feaa37c6829c828f2b940ce
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -10579,11 +8397,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-=======
 "acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.11.2, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
->>>>>>> origin/main
   version: 8.11.2
   resolution: "acorn@npm:8.11.2"
   bin:
@@ -10669,16 +8483,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"ahocorasick@npm:1.0.2":
-  version: 1.0.2
-  resolution: "ahocorasick@npm:1.0.2"
-  checksum: a13ce4403554ae782cf5e28d468a732acf1fd3d0bff251f5dcfddfa5497b6cc343948d69cd94dfdbe8d4dfdb81e2b34cb1c92079e6301f38b0143d314fb95bd6
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> origin/main
 "ajv-formats@npm:^2.1.1":
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
@@ -10756,11 +8560,7 @@ __metadata:
     react: ^18.0.0
     react-dom: ^18.0.0
     typescript: ^5.1.6
-<<<<<<< HEAD
-    vite: ^4.2.0
-=======
     vite: ^4.5.1
->>>>>>> origin/main
     vite-plugin-singlefile: ^0.13.3
     vite-plugin-svgr: ^2.4.0
   languageName: unknown
@@ -10832,11 +8632,7 @@ __metadata:
     stylelint-declaration-block-no-ignored-properties: ^2.6.0
     stylelint-value-no-unknown-custom-properties: ^4.0.0
     typescript: ^5.1.6
-<<<<<<< HEAD
-    vite: ^4.2.0
-=======
     vite: ^4.5.1
->>>>>>> origin/main
     vite-plugin-turbosnap: ^1.0.3
     yarn: ^1.22.10
   languageName: unknown
@@ -11716,15 +9512,9 @@ __metadata:
   linkType: hard
 
 "big-integer@npm:^1.6.44":
-<<<<<<< HEAD
-  version: 1.6.51
-  resolution: "big-integer@npm:1.6.51"
-  checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518
-=======
   version: 1.6.52
   resolution: "big-integer@npm:1.6.52"
   checksum: 6e86885787a20fed96521958ae9086960e4e4b5e74d04f3ef7513d4d0ad631a9f3bde2730fc8aaa4b00419fc865f6ec573e5320234531ef37505da7da192c40b
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -11994,19 +9784,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
-  version: 4.22.1
-  resolution: "browserslist@npm:4.22.1"
-  dependencies:
-    caniuse-lite: ^1.0.30001541
-    electron-to-chromium: ^1.4.535
-    node-releases: ^2.0.13
-    update-browserslist-db: ^1.0.13
-  bin:
-    browserslist: cli.js
-  checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862
-=======
 "browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.2":
   version: 4.22.2
   resolution: "browserslist@npm:4.22.2"
@@ -12018,7 +9795,6 @@ __metadata:
   bin:
     browserslist: cli.js
   checksum: 33ddfcd9145220099a7a1ac533cecfe5b7548ffeb29b313e1b57be6459000a1f8fa67e781cf4abee97268ac594d44134fcc4a6b2b4750ceddc9796e3a22076d9
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -12155,35 +9931,22 @@ __metadata:
   linkType: hard
 
 "cacache@npm:^18.0.0":
-<<<<<<< HEAD
-  version: 18.0.0
-  resolution: "cacache@npm:18.0.0"
-=======
   version: 18.0.1
   resolution: "cacache@npm:18.0.1"
->>>>>>> origin/main
   dependencies:
     "@npmcli/fs": ^3.1.0
     fs-minipass: ^3.0.0
     glob: ^10.2.2
     lru-cache: ^10.0.1
     minipass: ^7.0.3
-<<<<<<< HEAD
-    minipass-collect: ^1.0.2
-=======
     minipass-collect: ^2.0.1
->>>>>>> origin/main
     minipass-flush: ^1.0.5
     minipass-pipeline: ^1.2.4
     p-map: ^4.0.0
     ssri: ^10.0.0
     tar: ^6.1.11
     unique-filename: ^3.0.0
-<<<<<<< HEAD
-  checksum: 2cd6bf15551abd4165acb3a4d1ef0593b3aa2fd6853ae16b5bb62199c2faecf27d36555a9545c0e07dd03347ec052e782923bdcece724a24611986aafb53e152
-=======
   checksum: 5a0b3b2ea451a0379814dc1d3c81af48c7c6db15cd8f7d72e028501ae0036a599a99bbac9687bfec307afb2760808d1c7708e9477c8c70d2b166e7d80b162a23
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -12294,17 +10057,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001541":
-  version: 1.0.30001561
-  resolution: "caniuse-lite@npm:1.0.30001561"
-  checksum: 949829fe037e23346595614e01d362130245920503a12677f2506ce68e1240360113d6383febed41e8aa38cd0f5fd9c69c21b0af65a71c0246d560db489f1373
-=======
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
   version: 1.0.30001566
   resolution: "caniuse-lite@npm:1.0.30001566"
   checksum: 0f9084bf9f7d5c0a9ddb200c2baddb25dd2ad5a2f205f01e7b971f3e98e9a7bb23c2d86bae48237e9bc9782b682cffaaf3406d936937ab9844987dbe2a6401f2
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -12526,19 +10282,11 @@ __metadata:
   linkType: hard
 
 "clean-css@npm:^5.2.2":
-<<<<<<< HEAD
-  version: 5.3.2
-  resolution: "clean-css@npm:5.3.2"
-  dependencies:
-    source-map: ~0.6.0
-  checksum: 8787b281acc9878f309b5f835d410085deedfd4e126472666773040a6a8a72f472a1d24185947d23b87b1c419bf2c5ed429395d5c5ff8279c98b05d8011e9758
-=======
   version: 5.3.3
   resolution: "clean-css@npm:5.3.3"
   dependencies:
     source-map: ~0.6.0
   checksum: 941987c14860dd7d346d5cf121a82fd2caf8344160b1565c5387f7ccca4bbcaf885bace961be37c4f4713ce2d8c488dd89483c1add47bb779790edbfdcc79cbc
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -12582,15 +10330,9 @@ __metadata:
   linkType: hard
 
 "cli-spinners@npm:^2.5.0":
-<<<<<<< HEAD
-  version: 2.9.1
-  resolution: "cli-spinners@npm:2.9.1"
-  checksum: 1780618be58309c469205bc315db697934bac68bce78cd5dfd46248e507a533172d623c7348ecfd904734f597ce0a4e5538684843d2cfb7af485d4466699940c
-=======
   version: 2.9.2
   resolution: "cli-spinners@npm:2.9.2"
   checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -12710,8 +10452,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "clsx@npm:^2.0.0":
   version: 2.0.0
   resolution: "clsx@npm:2.0.0"
@@ -12719,7 +10459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "co@npm:^4.6.0":
   version: 4.6.0
   resolution: "co@npm:4.6.0"
@@ -12728,15 +10467,9 @@ __metadata:
   linkType: hard
 
 "codemirror@npm:^5.65.10":
-<<<<<<< HEAD
-  version: 5.65.15
-  resolution: "codemirror@npm:5.65.15"
-  checksum: 30e0cff9bfb2265b94fa6766e13975cb71db228e114d6d8cdcc160b495e32b0ff921ac09959715e3fef30a48c5a9d0655ffd0ff6c5fe7024656add438bb2b058
-=======
   version: 5.65.16
   resolution: "codemirror@npm:5.65.16"
   checksum: 1c5036bfffcce19b1ff91d8b158dcb45faba27047c4093f55ea7ad1165975179eb47c9ef604baa9c4f4ea6bf9817886c767f33e72fa9c62710404029be3c4744
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -13249,32 +10982,18 @@ __metadata:
   linkType: hard
 
 "core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
-<<<<<<< HEAD
-  version: 3.33.2
-  resolution: "core-js-compat@npm:3.33.2"
-  dependencies:
-    browserslist: ^4.22.1
-  checksum: 4206d3ff282a9188399e9003301fa4b96844152afcea7b9c9accc653542f40f581f77bf079b8be67f614e305da1f29e868a49ceebb6dbe3f5fb4a28bd2dbf431
-=======
   version: 3.34.0
   resolution: "core-js-compat@npm:3.34.0"
   dependencies:
     browserslist: ^4.22.2
   checksum: 6281f7f57a72f254c06611ec088445e11cf84e0b4edfb5f43dece1a1ff8b0ed0e81ed0bc291024761cd90c39d0f007d8bc46548265139808081d311c7cbc9c81
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "core-js-pure@npm:^3.23.3":
-<<<<<<< HEAD
-  version: 3.33.2
-  resolution: "core-js-pure@npm:3.33.2"
-  checksum: 601704482885e94a445b02d8b1e4da72f8f40a6eb54ef2f97e7bd912a9233119372b21a44ca9c7b39cd5597c281cde3a8ac629b696cfdf5ddd93ecda4f5a543f
-=======
   version: 3.34.0
   resolution: "core-js-pure@npm:3.34.0"
   checksum: 4c44ac4beff42e07f41eef3c9ecefc8ee3f9e91e1b9f278bf8520cc1fb37afb663cff77c182541dc42d58737f93ab0f30a33a5fe661fb161fdd8aa7fe78a5edf
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -13740,8 +11459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "csso@npm:5.0.5":
   version: 5.0.5
   resolution: "csso@npm:5.0.5"
@@ -13751,7 +11468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "csso@npm:^4.2.0":
   version: 4.2.0
   resolution: "csso@npm:4.2.0"
@@ -13761,18 +11477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"csso@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "csso@npm:5.0.5"
-  dependencies:
-    css-tree: ~2.2.0
-  checksum: 0ad858d36bf5012ed243e9ec69962a867509061986d2ee07cc040a4b26e4d062c00d4c07e5ba8d430706ceb02dd87edd30a52b5937fd45b1b6f2119c4993d59a
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> origin/main
 "cssom@npm:^0.5.0":
   version: 0.5.0
   resolution: "cssom@npm:0.5.0"
@@ -13805,17 +11509,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"csstype@npm:^3.0.2, csstype@npm:^3.0.6, csstype@npm:^3.0.7, csstype@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "csstype@npm:3.1.2"
-  checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5
-=======
 "csstype@npm:^3.0.2, csstype@npm:^3.0.7, csstype@npm:^3.1.2":
   version: 3.1.3
   resolution: "csstype@npm:3.1.3"
   checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -14003,11 +11700,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
-=======
 "debug@npm:4, debug@npm:4.3.4, debug@npm:^4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4":
->>>>>>> origin/main
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -14097,15 +11790,6 @@ __metadata:
   linkType: hard
 
 "deep-equal@npm:^2.0.5":
-<<<<<<< HEAD
-  version: 2.2.2
-  resolution: "deep-equal@npm:2.2.2"
-  dependencies:
-    array-buffer-byte-length: ^1.0.0
-    call-bind: ^1.0.2
-    es-get-iterator: ^1.1.3
-    get-intrinsic: ^1.2.1
-=======
   version: 2.2.3
   resolution: "deep-equal@npm:2.2.3"
   dependencies:
@@ -14113,7 +11797,6 @@ __metadata:
     call-bind: ^1.0.5
     es-get-iterator: ^1.1.3
     get-intrinsic: ^1.2.2
->>>>>>> origin/main
     is-arguments: ^1.1.1
     is-array-buffer: ^3.0.2
     is-date-object: ^1.0.5
@@ -14123,21 +11806,12 @@ __metadata:
     object-is: ^1.1.5
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-<<<<<<< HEAD
-    regexp.prototype.flags: ^1.5.0
-    side-channel: ^1.0.4
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.9
-  checksum: eb61c35157b6ecb96a5359b507b083fbff8ddb4c86a78a781ee38485f77a667465e45d63ee2ebd8a00e86d94c80e499906900cd82c2debb400237e1662cd5397
-=======
     regexp.prototype.flags: ^1.5.1
     side-channel: ^1.0.4
     which-boxed-primitive: ^1.0.2
     which-collection: ^1.0.1
     which-typed-array: ^1.1.13
   checksum: ee8852f23e4d20a5626c13b02f415ba443a1b30b4b3d39eaf366d59c4a85e6545d7ec917db44d476a85ae5a86064f7e5f7af7479f38f113995ba869f3a1ddc53
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -14215,11 +11889,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
-=======
 "define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
->>>>>>> origin/main
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -14716,17 +12386,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"electron-to-chromium@npm:^1.4.535":
-  version: 1.4.577
-  resolution: "electron-to-chromium@npm:1.4.577"
-  checksum: 822af571c8c94934655e46f77057bdce5474e1bcf7ceaa8a62fcec68554855d92f3d55de13b93d190ac88892ae89d0733645344c056bf684b190ca5db8ec1040
-=======
 "electron-to-chromium@npm:^1.4.601":
   version: 1.4.607
   resolution: "electron-to-chromium@npm:1.4.607"
   checksum: cc31233eaf2a6bb6268f97365861a4411db6823bec59126658245d4aec742cfeacb09135ada6321d27cfe74f1b72f04ff53cf2f5ac675c1b81deab035f97ab28
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -14991,18 +12654,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"es-module-lexer@npm:^1.2.1":
-  version: 1.3.1
-  resolution: "es-module-lexer@npm:1.3.1"
-  checksum: 3beafa7e171eb1e8cc45695edf8d51638488dddf65294d7911f8d6a96249da6a9838c87529262cc6ea53988d8272cec0f4bff93f476ed031a54ba3afb51a0ed3
-  languageName: node
-  linkType: hard
-
-"es-module-lexer@npm:^1.4.1":
-=======
 "es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.4.1":
->>>>>>> origin/main
   version: 1.4.1
   resolution: "es-module-lexer@npm:1.4.1"
   checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
@@ -15161,33 +12813,6 @@ __metadata:
   linkType: hard
 
 "esbuild@npm:^0.19.0":
-<<<<<<< HEAD
-  version: 0.19.5
-  resolution: "esbuild@npm:0.19.5"
-  dependencies:
-    "@esbuild/android-arm": 0.19.5
-    "@esbuild/android-arm64": 0.19.5
-    "@esbuild/android-x64": 0.19.5
-    "@esbuild/darwin-arm64": 0.19.5
-    "@esbuild/darwin-x64": 0.19.5
-    "@esbuild/freebsd-arm64": 0.19.5
-    "@esbuild/freebsd-x64": 0.19.5
-    "@esbuild/linux-arm": 0.19.5
-    "@esbuild/linux-arm64": 0.19.5
-    "@esbuild/linux-ia32": 0.19.5
-    "@esbuild/linux-loong64": 0.19.5
-    "@esbuild/linux-mips64el": 0.19.5
-    "@esbuild/linux-ppc64": 0.19.5
-    "@esbuild/linux-riscv64": 0.19.5
-    "@esbuild/linux-s390x": 0.19.5
-    "@esbuild/linux-x64": 0.19.5
-    "@esbuild/netbsd-x64": 0.19.5
-    "@esbuild/openbsd-x64": 0.19.5
-    "@esbuild/sunos-x64": 0.19.5
-    "@esbuild/win32-arm64": 0.19.5
-    "@esbuild/win32-ia32": 0.19.5
-    "@esbuild/win32-x64": 0.19.5
-=======
   version: 0.19.8
   resolution: "esbuild@npm:0.19.8"
   dependencies:
@@ -15213,7 +12838,6 @@ __metadata:
     "@esbuild/win32-arm64": 0.19.8
     "@esbuild/win32-ia32": 0.19.8
     "@esbuild/win32-x64": 0.19.8
->>>>>>> origin/main
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -15261,11 +12885,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-<<<<<<< HEAD
-  checksum: 5a0227cf6ffffa3076714d88230af1dfdd2fc363d91bd712a81fb91230c315a395e2c9b7588eee62986aeebf4999804b9b1b59eeab8e2457184eb0056bfe20c8
-=======
   checksum: 1dff99482ecbfcc642ec66c71e4dc5c73ce6aef68e8158a4937890b570e86a95959ac47e0f14785ba70df5a673ae4289df88a162e9759b02367ed28074cee8ba
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -15472,22 +13092,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-testing-library@npm:^6.0.2":
-<<<<<<< HEAD
-  version: 6.1.0
-  resolution: "eslint-plugin-testing-library@npm:6.1.0"
-=======
   version: 6.2.0
   resolution: "eslint-plugin-testing-library@npm:6.2.0"
->>>>>>> origin/main
   dependencies:
     "@typescript-eslint/utils": ^5.58.0
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0
-<<<<<<< HEAD
-  checksum: 67d2f521a6af623c157d05bbefa743d9aa360d5462a9b38a82a79b0ba008cb4d6ba3f604f54ac9d12405c53b6744695fc7fde7875f2b83aa3f85a8ced7687be3
-=======
   checksum: 7af7e0a1eee44c6ba65ce2ae99f8e46ce709a319f4cce778bb0af2dda5828d78f3a81e8989c7b691a8b9b9fef102b56136209aac700038b9e64794600b0d12db
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -15519,15 +13130,6 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.50.0":
-<<<<<<< HEAD
-  version: 8.53.0
-  resolution: "eslint@npm:8.53.0"
-  dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.6.1
-    "@eslint/eslintrc": ^2.1.3
-    "@eslint/js": 8.53.0
-=======
   version: 8.55.0
   resolution: "eslint@npm:8.55.0"
   dependencies:
@@ -15535,7 +13137,6 @@ __metadata:
     "@eslint-community/regexpp": ^4.6.1
     "@eslint/eslintrc": ^2.1.4
     "@eslint/js": 8.55.0
->>>>>>> origin/main
     "@humanwhocodes/config-array": ^0.11.13
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
@@ -15572,11 +13173,7 @@ __metadata:
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-<<<<<<< HEAD
-  checksum: 2da808655c7aa4b33f8970ba30d96b453c3071cc4d6cd60d367163430677e32ff186b65270816b662d29139283138bff81f28dddeb2e73265495245a316ed02c
-=======
   checksum: 83f82a604559dc1faae79d28fdf3dfc9e592ca221052e2ea516e1b379b37e77e4597705a16880e2f5ece4f79087c1dd13fd7f6e9746f794a401175519db18b41
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -16409,22 +14006,13 @@ __metadata:
   linkType: hard
 
 "flat-cache@npm:^3.0.4":
-<<<<<<< HEAD
-  version: 3.1.1
-  resolution: "flat-cache@npm:3.1.1"
-=======
   version: 3.2.0
   resolution: "flat-cache@npm:3.2.0"
->>>>>>> origin/main
   dependencies:
     flatted: ^3.2.9
     keyv: ^4.5.3
     rimraf: ^3.0.2
-<<<<<<< HEAD
-  checksum: 4958cfe0f46acf84953d4e16676ef5f0d38eab3a92d532a1e8d5f88f11eea8b36d5d598070ff2aeae15f1fde18f8d7d089eefaf9db10b5a587cc1c9072325c7a
-=======
   checksum: e7e0f59801e288b54bee5cb9681e9ee21ee28ef309f886b312c9d08415b79fc0f24ac842f84356ce80f47d6a53de62197ce0e6e148dc42d5db005992e2a756ec
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -16445,15 +14033,9 @@ __metadata:
   linkType: hard
 
 "flow-parser@npm:0.*":
-<<<<<<< HEAD
-  version: 0.220.1
-  resolution: "flow-parser@npm:0.220.1"
-  checksum: ec9ff1b5a0643ae256e805121941017fba3da5ab0e6e8272f3ff4b76c60fe4dde5cf2cf5208168a142164afb9cd04df112906b6dacb908788753828fbaafa284
-=======
   version: 0.223.3
   resolution: "flow-parser@npm:0.223.3"
   checksum: 4c0df178ff2e9140f57b5e7321b11e1cb827e00fbad6f342742c5834bd313f1bb0fe84d919d36e0c593e916c4ae5c8a93fcdb42c4328d6c5d77d75c8eed12090
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -16579,15 +14161,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"framer-motion@npm:^10.0.0, framer-motion@npm:^10.16.2":
-  version: 10.16.4
-  resolution: "framer-motion@npm:10.16.4"
-=======
 "framer-motion@npm:^10.0.0, framer-motion@npm:^10.16.2, framer-motion@npm:^10.16.5":
   version: 10.16.15
   resolution: "framer-motion@npm:10.16.15"
->>>>>>> origin/main
   dependencies:
     "@emotion/is-prop-valid": ^0.8.2
     tslib: ^2.4.0
@@ -16602,32 +14178,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-<<<<<<< HEAD
-  checksum: 57eb252f25a2c4ee14b024295c6a1162a53a05e0321bdb9c8a22ec266fbe777832823eaa0309e42854170fcde16c42915c6c5d0208b628fd000d6fab013c501f
-  languageName: node
-  linkType: hard
-
-"framer-motion@npm:^10.16.5":
-  version: 10.16.5
-  resolution: "framer-motion@npm:10.16.5"
-  dependencies:
-    "@emotion/is-prop-valid": ^0.8.2
-    tslib: ^2.4.0
-  peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  dependenciesMeta:
-    "@emotion/is-prop-valid":
-      optional: true
-  peerDependenciesMeta:
-    react:
-      optional: true
-    react-dom:
-      optional: true
-  checksum: 189e26745c860390d9320586c11248c81c63edf093cda33f95cc6f5e5a31fdf09ed64319c8303923692c36beb5cf56a1a40a32c70520d55df37b7d77a690aeb0
-=======
   checksum: f7c00695bbc20c32c37047f64588a0274d7ffd3713c6acf45aba03707424757c2e329c85e2ec872ebb47ee6dec293fc581c803d3f19207857aa5f388a329eb8f
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -16669,11 +14220,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0":
-=======
 "fs-extra@npm:11.1.1":
->>>>>>> origin/main
   version: 11.1.1
   resolution: "fs-extra@npm:11.1.1"
   dependencies:
@@ -16695,8 +14242,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "fs-extra@npm:^11.1.0":
   version: 11.2.0
   resolution: "fs-extra@npm:11.2.0"
@@ -16708,7 +14253,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "fs-extra@npm:^3.0.1":
   version: 3.0.1
   resolution: "fs-extra@npm:3.0.1"
@@ -16940,15 +14484,9 @@ __metadata:
   linkType: hard
 
 "get-npm-tarball-url@npm:^2.0.3":
-<<<<<<< HEAD
-  version: 2.0.3
-  resolution: "get-npm-tarball-url@npm:2.0.3"
-  checksum: 8ad48a6f1126697665e12ebf053e0d1c3b15b3c4f29ea6c458387ac68d044ea1c08f0f2eb5c0fe35447fdd2da4f2fb5c9882feb5a2ea195c773f94e762c9b886
-=======
   version: 2.1.0
   resolution: "get-npm-tarball-url@npm:2.1.0"
   checksum: 02b96993ad5a04cbd0ef0577ac3cc9e2e78a7c60db6bb5e6c8fe78950fc1fc3d093314987629a2fda3083228d91a93670bde321767ca2cf89ce7f463c9e44071
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -17424,15 +14962,9 @@ __metadata:
   linkType: hard
 
 "groq@npm:^3.0.0, groq@npm:^3.14.5":
-<<<<<<< HEAD
-  version: 3.19.1
-  resolution: "groq@npm:3.19.1"
-  checksum: c1f8388652d62b27db8260a673281fe575de7dd4b77b70c21229958fa09a7b6c0c25e28c2e5ab107e7f05516023eaac23afbfea1fe599a68c58a405d26e0ef8f
-=======
   version: 3.21.0
   resolution: "groq@npm:3.21.0"
   checksum: 20576fb6926499d0128a675e45d249ad85bbceddb28c2b4c0d58f07cc84188597a5f6b511937b4d8575ee588377723f0b3f8a3f78dbd39f9bac13e741511d937
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -17546,16 +15078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"has@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "has@npm:1.0.4"
-  checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> origin/main
 "hash-base@npm:^3.0.0":
   version: 3.1.0
   resolution: "hash-base@npm:3.1.0"
@@ -17846,13 +15368,8 @@ __metadata:
   linkType: hard
 
 "html-webpack-plugin@npm:^5.5.0":
-<<<<<<< HEAD
-  version: 5.5.3
-  resolution: "html-webpack-plugin@npm:5.5.3"
-=======
   version: 5.5.4
   resolution: "html-webpack-plugin@npm:5.5.4"
->>>>>>> origin/main
   dependencies:
     "@types/html-minifier-terser": ^6.0.0
     html-minifier-terser: ^6.0.2
@@ -17861,11 +15378,7 @@ __metadata:
     tapable: ^2.0.0
   peerDependencies:
     webpack: ^5.20.0
-<<<<<<< HEAD
-  checksum: ccf685195739c372ad641bbd0c9100a847904f34eedc7aff3ece7856cd6c78fd3746d2d615af1bb71e5727993fe711b89e9b744f033ed3fde646540bf5d5e954
-=======
   checksum: b49befb73d67a3716fd0e6f7776b108d2b0b7050fb8221f05cd114cbae13c03150a13b7cdf5e76170be040ce7936a1cf76f7a4bfd9ebe1552b72d7889a74c374
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -18157,15 +15670,9 @@ __metadata:
   linkType: hard
 
 "ignore@npm:^5.1.1, ignore@npm:^5.1.4, ignore@npm:^5.1.9, ignore@npm:^5.2.0, ignore@npm:^5.2.1, ignore@npm:^5.2.4":
-<<<<<<< HEAD
-  version: 5.2.4
-  resolution: "ignore@npm:5.2.4"
-  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
-=======
   version: 5.3.0
   resolution: "ignore@npm:5.3.0"
   checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -18293,15 +15800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"inline-style-prefixer@npm:^6.0.0":
-  version: 6.0.4
-  resolution: "inline-style-prefixer@npm:6.0.4"
-  dependencies:
-    css-in-js-utils: ^3.1.0
-    fast-loops: ^1.1.3
-  checksum: caf7a75d18acbedc7e3b8bfac17563082becd2df6b65accad964a6afdf490329b42315c37fe65ba0177cc10fd32809eb40d62aba23a0118c74d87d4fc58defa2
-=======
 "inline-style-prefixer@npm:^7.0.0":
   version: 7.0.0
   resolution: "inline-style-prefixer@npm:7.0.0"
@@ -18309,7 +15807,6 @@ __metadata:
     css-in-js-utils: ^3.1.0
     fast-loops: ^1.1.3
   checksum: 89fd73eb06e7392e24032ea33b8b33ae7f9a24298f2d9ebbf7b31a3a3934247270047f4f49a454a363aace14e25c3a20fd97465405b0399cc888e5a2bc04ec05
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -18531,20 +16028,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0":
-  version: 2.13.0
-  resolution: "is-core-module@npm:2.13.0"
-  dependencies:
-    has: ^1.0.3
-  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.13.1":
-=======
 "is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0":
->>>>>>> origin/main
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
@@ -19079,15 +16563,9 @@ __metadata:
   linkType: hard
 
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
-<<<<<<< HEAD
-  version: 3.2.1
-  resolution: "istanbul-lib-coverage@npm:3.2.1"
-  checksum: 382d5f698fed81de5c32a32d91848cba29df097bfce162f3cdd7fb66de7feeace9873d75c9d6bf3e34b1a4cda6be5bd819ec41c4b532c584dbff7c69db85448e
-=======
   version: 3.2.2
   resolution: "istanbul-lib-coverage@npm:3.2.2"
   checksum: 2367407a8d13982d8f7a859a35e7f8dd5d8f75aae4bb5484ede3a9ea1b426dc245aff28b976a2af48ee759fdd9be374ce2bd2669b644f31e76c5f46a2e29a831
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -20253,8 +17731,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "lilconfig@npm:^3.0.0":
   version: 3.0.0
   resolution: "lilconfig@npm:3.0.0"
@@ -20262,7 +17738,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -20596,19 +18071,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"lru-cache@npm:10.0.1, lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
-=======
 "lru-cache@npm:10.0.1":
->>>>>>> origin/main
   version: 10.0.1
   resolution: "lru-cache@npm:10.0.1"
   checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
   version: 10.1.0
   resolution: "lru-cache@npm:10.1.0"
@@ -20616,7 +18085,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "lru-cache@npm:^4.0.0, lru-cache@npm:^4.0.1, lru-cache@npm:^4.1.1":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
@@ -21211,21 +18679,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
-  dependencies:
-    minipass: ^3.0.0
-  checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
-=======
 "minipass-collect@npm:^2.0.1":
   version: 2.0.1
   resolution: "minipass-collect@npm:2.0.1"
   dependencies:
     minipass: ^7.0.3
   checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -21359,15 +18818,9 @@ __metadata:
   linkType: hard
 
 "mixme@npm:^0.5.1":
-<<<<<<< HEAD
-  version: 0.5.9
-  resolution: "mixme@npm:0.5.9"
-  checksum: ec0e96b2fa099a051fe14477577e3da13f158690c64114a50ecd039694ca2cca1cb7c71a8755aaee8a3ef7229ef33408df822faa4d1d6123b52295eecf50620f
-=======
   version: 0.5.10
   resolution: "mixme@npm:0.5.10"
   checksum: 51885f19847b98859645a592917f3939d6f262ba3cc1843a3d7858ac894704b054e7a94737a53163bc1e870e3ea23316ba97d3ba20e1dfd292fe74d5a318be98
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -21407,8 +18860,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "modern-ahocorasick@npm:^1.0.0":
   version: 1.0.1
   resolution: "modern-ahocorasick@npm:1.0.1"
@@ -21416,7 +18867,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "module-alias@npm:^2.2.2":
   version: 2.2.3
   resolution: "module-alias@npm:2.2.3"
@@ -21535,24 +18985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"nano-css@npm:^5.3.1":
-  version: 5.3.5
-  resolution: "nano-css@npm:5.3.5"
-  dependencies:
-    css-tree: ^1.1.2
-    csstype: ^3.0.6
-    fastest-stable-stringify: ^2.0.2
-    inline-style-prefixer: ^6.0.0
-    rtl-css-js: ^1.14.0
-    sourcemap-codec: ^1.4.8
-    stacktrace-js: ^2.0.2
-    stylis: ^4.0.6
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 8d4e59a2a29477221af47320d850a7dcee1ac51774fb5a0dce6ee59b22174c7149f75108235de85559581fbb2b93aa222a2b32ea53c93ba3f5d322c4d098c355
-=======
 "nano-css@npm:^5.6.1":
   version: 5.6.1
   resolution: "nano-css@npm:5.6.1"
@@ -21569,7 +19001,6 @@ __metadata:
     react: "*"
     react-dom: "*"
   checksum: 735f02c030a9416bb6060503d24f18f2b2c9f43e4893c2d8714508d00f9d114b8a134df3623e94e376b0b1d794b0cacac6a48f8e5fb2b7fa8996071bcad590b8
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -21587,20 +19018,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"nanoid@npm:^3.1.12, nanoid@npm:^3.1.30, nanoid@npm:^3.3.3, nanoid@npm:^3.3.6":
-  version: 3.3.6
-  resolution: "nanoid@npm:3.3.6"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.3.4":
-=======
 "nanoid@npm:^3.1.12, nanoid@npm:^3.1.30, nanoid@npm:^3.3.3, nanoid@npm:^3.3.4, nanoid@npm:^3.3.7":
->>>>>>> origin/main
   version: 3.3.7
   resolution: "nanoid@npm:3.3.7"
   bin:
@@ -21759,19 +19177,11 @@ __metadata:
   linkType: hard
 
 "node-abi@npm:^3.3.0":
-<<<<<<< HEAD
-  version: 3.51.0
-  resolution: "node-abi@npm:3.51.0"
-  dependencies:
-    semver: ^7.3.5
-  checksum: 3fabc9d58f0478767157560249f79c4a9e95082b96700cd8cc470f517bd566dbab82a37c862db3f78d3187be9f19f5cd9822b6f1b7ac7a3254fa70c3e3b38a83
-=======
   version: 3.52.0
   resolution: "node-abi@npm:3.52.0"
   dependencies:
     semver: ^7.3.5
   checksum: 2ef47937d058fa1f0817294fe5ac3ec1d370d3f8eb4931ea920b7e147033390058d3bc35b64d9161036ad2fda191aa1155005cea20ec50984312637221559354
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -21901,34 +19311,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"node-releases@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "node-releases@npm:2.0.13"
-  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
-=======
 "node-releases@npm:^2.0.14":
   version: 2.0.14
   resolution: "node-releases@npm:2.0.14"
   checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
 "nodemon@npm:^3.0.1":
-<<<<<<< HEAD
-  version: 3.0.1
-  resolution: "nodemon@npm:3.0.1"
-  dependencies:
-    chokidar: ^3.5.2
-    debug: ^3.2.7
-=======
   version: 3.0.2
   resolution: "nodemon@npm:3.0.2"
   dependencies:
     chokidar: ^3.5.2
     debug: ^4
->>>>>>> origin/main
     ignore-by-default: ^1.0.1
     minimatch: ^3.1.2
     pstree.remy: ^1.1.8
@@ -21939,11 +19334,7 @@ __metadata:
     undefsafe: ^2.0.5
   bin:
     nodemon: bin/nodemon.js
-<<<<<<< HEAD
-  checksum: 6a5d81855760d6617049eccce10ccf02bddb482dab13ceea5280ae595ec7004eee13e7b934368e3f46c37fe4d970342a8c38c99cae7e93e4d7a3ed1c1ecb6acf
-=======
   checksum: 61f3dd207ad444f4a7a2f1aa44adc886605c96c7bc6286291c2360e5e2cd26c3828c90a1418a60783a9da2463593383149135a5a4c099918c54d34a611745499
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -22174,16 +19565,6 @@ __metadata:
   linkType: hard
 
 "object.assign@npm:^4.1.4":
-<<<<<<< HEAD
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    has-symbols: ^1.0.3
-    object-keys: ^1.1.1
-  checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864
-=======
   version: 4.1.5
   resolution: "object.assign@npm:4.1.5"
   dependencies:
@@ -22192,7 +19573,6 @@ __metadata:
     has-symbols: ^1.0.3
     object-keys: ^1.1.1
   checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -23091,13 +20471,8 @@ __metadata:
   linkType: hard
 
 "pino@npm:^8.11.0, pino@npm:^8.14.1":
-<<<<<<< HEAD
-  version: 8.16.1
-  resolution: "pino@npm:8.16.1"
-=======
   version: 8.16.2
   resolution: "pino@npm:8.16.2"
->>>>>>> origin/main
   dependencies:
     atomic-sleep: ^1.0.0
     fast-redact: ^3.1.1
@@ -23112,11 +20487,7 @@ __metadata:
     thread-stream: ^2.0.0
   bin:
     pino: bin.js
-<<<<<<< HEAD
-  checksum: a52730479e526de7fbfb7bed492a365da0dfabaacc71fc9b67831b413f8d6948c7f984a385e47483c58099872d7e1a2c630c882eeccb6e237215540a96f61787
-=======
   checksum: 78d194112f09f82471ec7e0022bc114ddb833375d60236be40ac55bf8a8ae26b88c8780d54912687c7cd6d0321ba5b1a78ffa89c5e9d5855ef849c3b9273c7ab
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -23465,19 +20836,11 @@ __metadata:
   linkType: hard
 
 "postcss-load-config@npm:^4.0.1":
-<<<<<<< HEAD
-  version: 4.0.1
-  resolution: "postcss-load-config@npm:4.0.1"
-  dependencies:
-    lilconfig: ^2.0.5
-    yaml: ^2.1.1
-=======
   version: 4.0.2
   resolution: "postcss-load-config@npm:4.0.2"
   dependencies:
     lilconfig: ^3.0.0
     yaml: ^2.3.4
->>>>>>> origin/main
   peerDependencies:
     postcss: ">=8.0.9"
     ts-node: ">=9.0.0"
@@ -23486,11 +20849,7 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-<<<<<<< HEAD
-  checksum: b61f890499ed7dcda1e36c20a9582b17d745bad5e2b2c7bc96942465e406bc43ae03f270c08e60d1e29dab1ee50cb26970b5eb20c9aae30e066e20bd607ae4e4
-=======
   checksum: 7c27dd3801db4eae207a5116fed2db6b1ebb780b40c3dd62a3e57e087093a8e6a14ee17ada729fee903152d6ef4826c6339eb135bee6208e0f3140d7e8090185
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -23885,15 +21244,6 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.0.0, postcss@npm:^8.2.14, postcss@npm:^8.4.19, postcss@npm:^8.4.21, postcss@npm:^8.4.23, postcss@npm:^8.4.27, postcss@npm:^8.4.31":
-<<<<<<< HEAD
-  version: 8.4.31
-  resolution: "postcss@npm:8.4.31"
-  dependencies:
-    nanoid: ^3.3.6
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
-=======
   version: 8.4.32
   resolution: "postcss@npm:8.4.32"
   dependencies:
@@ -23901,7 +21251,6 @@ __metadata:
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
   checksum: 220d9d0bf5d65be7ed31006c523bfb11619461d296245c1231831f90150aeb4a31eab9983ac9c5c89759a3ca8b60b3e0d098574964e1691673c3ce5c494305ae
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -24093,16 +21442,6 @@ __metadata:
   linkType: hard
 
 "prism-react-renderer@npm:^2.0.0":
-<<<<<<< HEAD
-  version: 2.1.0
-  resolution: "prism-react-renderer@npm:2.1.0"
-  dependencies:
-    "@types/prismjs": ^1.26.0
-    clsx: ^1.2.1
-  peerDependencies:
-    react: ">=16.0.0"
-  checksum: 61b4eb22bdbf01005a0d7ec2a24a27b69e28f124a1fbbfc2adb4d7d41a7929ea94d5ce506a361dd5a230728402f02595d521d9a5286d74ec9b34be0896c513a5
-=======
   version: 2.3.0
   resolution: "prism-react-renderer@npm:2.3.0"
   dependencies:
@@ -24111,7 +21450,6 @@ __metadata:
   peerDependencies:
     react: ">=16.0.0"
   checksum: 29b24eb5015c09e1b7e3fa2941584ead6fceb5556fdfbe7c34548d96886e0b291290bda93a421aab8b26ce6aae677387aac294982d11349a050843f6dbbc7449
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -24144,15 +21482,9 @@ __metadata:
   linkType: hard
 
 "process-warning@npm:^2.0.0":
-<<<<<<< HEAD
-  version: 2.3.0
-  resolution: "process-warning@npm:2.3.0"
-  checksum: ee795f7fba5b289a3c15a9dfcde40c277efe75ac1ad63f9fb7851d3eb08d1939c67e310dc7ca2cc914f8293e2517cd60839e19d1c130f908b06c970a51a0d2a7
-=======
   version: 2.3.2
   resolution: "process-warning@npm:2.3.2"
   checksum: cbeddc85d3963eccd6578b1eea5ba981383d1ec688d6e4ba5bf0ca6662d094c024b44dfcb1c530662c7694b68fe09fd95fa0269a1309090d793008f4553e7784
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -24887,28 +22219,6 @@ __metadata:
   linkType: hard
 
 "react-router-dom@npm:^6.3.0":
-<<<<<<< HEAD
-  version: 6.18.0
-  resolution: "react-router-dom@npm:6.18.0"
-  dependencies:
-    "@remix-run/router": 1.11.0
-    react-router: 6.18.0
-  peerDependencies:
-    react: ">=16.8"
-    react-dom: ">=16.8"
-  checksum: ca5c9a9f748f4ff9677d25762970fc59cb216568aad0ebc668b22398222a940f767680bc9a3e65a92e940d3fe05731eda8a4b352ccbf1054904b3b785a9f5e6f
-  languageName: node
-  linkType: hard
-
-"react-router@npm:6.18.0":
-  version: 6.18.0
-  resolution: "react-router@npm:6.18.0"
-  dependencies:
-    "@remix-run/router": 1.11.0
-  peerDependencies:
-    react: ">=16.8"
-  checksum: 03e9a23c5b75d8813720745e2952bb9e62ec310d238cde4f19e0ce73582701fa5e04cf609ff9ced978e9e6c531b5e333b9aee35371e6c4743afc2829e32e926a
-=======
   version: 6.20.1
   resolution: "react-router-dom@npm:6.20.1"
   dependencies:
@@ -24929,7 +22239,6 @@ __metadata:
   peerDependencies:
     react: ">=16.8"
   checksum: 046efa4b101c64de823f0c838948a50ad53f3ccdd7887604d93c1ccf19c4e797935cab602aa001d793544445412ebeb95c2c7f880e3e86ca447772db574789d7
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -25052,13 +22361,8 @@ __metadata:
   linkType: hard
 
 "react-use@npm:^17.4.0":
-<<<<<<< HEAD
-  version: 17.4.0
-  resolution: "react-use@npm:17.4.0"
-=======
   version: 17.4.2
   resolution: "react-use@npm:17.4.2"
->>>>>>> origin/main
   dependencies:
     "@types/js-cookie": ^2.2.6
     "@xobotyi/scrollbar-width": ^1.9.5
@@ -25066,11 +22370,7 @@ __metadata:
     fast-deep-equal: ^3.1.3
     fast-shallow-equal: ^1.0.0
     js-cookie: ^2.2.1
-<<<<<<< HEAD
-    nano-css: ^5.3.1
-=======
     nano-css: ^5.6.1
->>>>>>> origin/main
     react-universal-interface: ^0.6.2
     resize-observer-polyfill: ^1.5.1
     screenfull: ^5.1.0
@@ -25079,15 +22379,9 @@ __metadata:
     ts-easing: ^0.2.0
     tslib: ^2.1.0
   peerDependencies:
-<<<<<<< HEAD
-    react: ^16.8.0  || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0  || ^17.0.0 || ^18.0.0
-  checksum: 0889da919b49a186de375ec15d2778b954ae981c523acd17dd496e4a4da7b6190efe7993491e1b85fdd6de3e745d08a4eaba4caa35408d570b5f1de550f35d11
-=======
     react: "*"
     react-dom: "*"
   checksum: 1b15add951a80eee637045e5e769dd565edde47838da3d8d0e9a4a2cfd547eb59626b5c5b020ba3c067c01356d2042c5948c534a90729114a7fc7d1e18763d0c
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -25805,11 +23099,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"rtl-css-js@npm:^1.14.0":
-=======
 "rtl-css-js@npm:^1.16.1":
->>>>>>> origin/main
   version: 1.16.1
   resolution: "rtl-css-js@npm:1.16.1"
   dependencies:
@@ -26236,20 +23526,12 @@ __metadata:
   linkType: hard
 
 "selfsigned@npm:^2.1.1":
-<<<<<<< HEAD
-  version: 2.1.1
-  resolution: "selfsigned@npm:2.1.1"
-  dependencies:
-    node-forge: ^1
-  checksum: aa9ce2150a54838978d5c0aee54d7ebe77649a32e4e690eb91775f71fdff773874a4fbafd0ac73d8ec3b702ff8a395c604df4f8e8868528f36fd6c15076fb43a
-=======
   version: 2.4.1
   resolution: "selfsigned@npm:2.4.1"
   dependencies:
     "@types/node-forge": ^1.3.0
     node-forge: ^1
   checksum: 38b91c56f1d7949c0b77f9bbe4545b19518475cae15e7d7f0043f87b1626710b011ce89879a88969651f650a19d213bb15b7d5b4c2877df9eeeff7ba8f8b9bfa
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -26855,16 +24137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"sourcemap-codec@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> origin/main
 "space-separated-tokens@npm:^1.0.0":
   version: 1.1.5
   resolution: "space-separated-tokens@npm:1.1.5"
@@ -27210,21 +24482,12 @@ __metadata:
   linkType: hard
 
 "streamx@npm:^2.15.0":
-<<<<<<< HEAD
-  version: 2.15.2
-  resolution: "streamx@npm:2.15.2"
-  dependencies:
-    fast-fifo: ^1.1.0
-    queue-tick: ^1.0.1
-  checksum: 41a801e17dcdcb2f2e5055acaeeb50594825950d353a77b104509dedf02a88a69ce2534ff1a540bd2d1edb0ff0667d3d3344234b5a7342208d844858fb9ea001
-=======
   version: 2.15.5
   resolution: "streamx@npm:2.15.5"
   dependencies:
     fast-fifo: ^1.1.0
     queue-tick: ^1.0.1
   checksum: 52e0ec94026d67c9e2e2e1090f05e5b138c2f2822462d9a8ef4a4805625a31d103e55ea5267fcd9bfe041374926424e42aec2dda28a85cb9de42c2a16d416d94
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -27516,13 +24779,8 @@ __metadata:
   linkType: hard
 
 "styled-components@npm:^6.0.0":
-<<<<<<< HEAD
-  version: 6.1.0
-  resolution: "styled-components@npm:6.1.0"
-=======
   version: 6.1.1
   resolution: "styled-components@npm:6.1.1"
->>>>>>> origin/main
   dependencies:
     "@emotion/is-prop-valid": ^1.2.1
     "@emotion/unitless": ^0.8.0
@@ -27536,11 +24794,7 @@ __metadata:
   peerDependencies:
     react: ">= 16.8.0"
     react-dom: ">= 16.8.0"
-<<<<<<< HEAD
-  checksum: 989262a2be35f09fc0a277da9ed21280d11e0de90e4160d4c0612faed3f4bf2d1667f227e3ee1393a0bf037869075e5c3b4160627777dc7cc533fed89c6d64e0
-=======
   checksum: d062ba473014a551ed76f4876feaccebc06aaa8dc2849c9d72f67420701dbc7d7c9af1dfa5207b2ad5df9b2e122ddf9e5fe6b6b69ba4d93c4c702abdff19435a
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -27680,11 +24934,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"stylis@npm:^4.0.6, stylis@npm:^4.3.0":
-=======
 "stylis@npm:^4.3.0":
->>>>>>> origin/main
   version: 4.3.0
   resolution: "stylis@npm:4.3.0"
   checksum: 6120de3f03eacf3b5adc8e7919c4cca991089156a6badc5248752a3088106afaaf74996211a6817a7760ebeadca09004048eea31875bd8d4df51386365c50025
@@ -27794,32 +25044,19 @@ __metadata:
   linkType: hard
 
 "svgo@npm:^3.0.2":
-<<<<<<< HEAD
-  version: 3.0.2
-  resolution: "svgo@npm:3.0.2"
-=======
   version: 3.0.5
   resolution: "svgo@npm:3.0.5"
->>>>>>> origin/main
   dependencies:
     "@trysound/sax": 0.2.0
     commander: ^7.2.0
     css-select: ^5.1.0
     css-tree: ^2.2.1
-<<<<<<< HEAD
-    csso: ^5.0.5
-    picocolors: ^1.0.0
-  bin:
-    svgo: bin/svgo
-  checksum: 381ba14aa782e71ab7033227634a3041c11fa3e2769aeaf0df43a08a615de61925108e34f55af6e7c5146f4a3109e78deabb4fa9d687e36d45d1f848b4e23d17
-=======
     css-what: ^6.1.0
     csso: 5.0.5
     picocolors: ^1.0.0
   bin:
     svgo: ./bin/svgo
   checksum: f6f4dcb704e58b47d3aea9370b967138cc02c16dfcb1df2b8ceeb08e35bca283a9396f225868d53f1e73dbb0f4109f6c0b9dead487562f2fc4ecce7c4c3c6e2b
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -27889,13 +25126,8 @@ __metadata:
   linkType: hard
 
 "tailwindcss@npm:^3.3.3":
-<<<<<<< HEAD
-  version: 3.3.5
-  resolution: "tailwindcss@npm:3.3.5"
-=======
   version: 3.3.6
   resolution: "tailwindcss@npm:3.3.6"
->>>>>>> origin/main
   dependencies:
     "@alloc/quick-lru": ^5.2.0
     arg: ^5.0.2
@@ -27922,11 +25154,7 @@ __metadata:
   bin:
     tailwind: lib/cli.js
     tailwindcss: lib/cli.js
-<<<<<<< HEAD
-  checksum: e04bb3bb7f9f17e9b6db0c7ace755ef0d6d05bff36ebeb9e5006e13c018ed5566f09db30a1a34380e38fa93ebbb4ae0e28fe726879d5e9ddd8c5b52bffd26f14
-=======
   checksum: 44632ac471248ecebcee1a2f15a0c3e9b8383513e71692b586aa2fe56dca12828ff70de3d340c898f27b27480e8475e5eb345fb2ebb813028bb2393578a34337
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -28102,13 +25330,8 @@ __metadata:
   linkType: hard
 
 "terser@npm:^5.10.0, terser@npm:^5.16.8":
-<<<<<<< HEAD
-  version: 5.24.0
-  resolution: "terser@npm:5.24.0"
-=======
   version: 5.25.0
   resolution: "terser@npm:5.25.0"
->>>>>>> origin/main
   dependencies:
     "@jridgewell/source-map": ^0.3.3
     acorn: ^8.8.2
@@ -28116,11 +25339,7 @@ __metadata:
     source-map-support: ~0.5.20
   bin:
     terser: bin/terser
-<<<<<<< HEAD
-  checksum: d88f774b6fa711a234fcecefd7657f99189c367e17dbe95a51c2776d426ad0e4d98d1ffe6edfdf299877c7602e495bdd711d21b2caaec188410795e5447d0f6c
-=======
   checksum: ddc5ba020060cea976105ea83f5832385297f5091198f10143c1224e35bbb4ad9dfc40ee95d51a8f1290d0a4c7910d66e0ecc4b596402e94ba829bfc58022151
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -28315,15 +25534,9 @@ __metadata:
   linkType: hard
 
 "tocbot@npm:^4.20.1":
-<<<<<<< HEAD
-  version: 4.21.6
-  resolution: "tocbot@npm:4.21.6"
-  checksum: b3663966515d44141a7b5a46a4a1f43163d899de46bfef8c605523be8401eb853694373f7fe86eb95dabb10e3296dc21e3eb8cd6706233b50536b1209a9d6945
-=======
   version: 4.23.0
   resolution: "tocbot@npm:4.23.0"
   checksum: 04289b9ae5f2b2c6e64342bc549fedf44c81a08070feec547fc073a08f3351f7e08f67f5913c992b664caec335509213787143c8739fbba9e14c486669b62968
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -28785,21 +25998,12 @@ __metadata:
   linkType: hard
 
 "typescript@npm:>=5.0.0, typescript@npm:^5.1.6":
-<<<<<<< HEAD
-  version: 5.2.2
-  resolution: "typescript@npm:5.2.2"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
-=======
   version: 5.3.3
   resolution: "typescript@npm:5.3.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
   checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -28814,21 +26018,12 @@ __metadata:
   linkType: hard
 
 "typescript@patch:typescript@>=5.0.0#~builtin<compat/typescript>, typescript@patch:typescript@^5.1.6#~builtin<compat/typescript>":
-<<<<<<< HEAD
-  version: 5.2.2
-  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=7ad353"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
-=======
   version: 5.3.3
   resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=7ad353"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
   checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -29086,16 +26281,6 @@ __metadata:
   linkType: hard
 
 "unplugin@npm:^1.3.1":
-<<<<<<< HEAD
-  version: 1.5.0
-  resolution: "unplugin@npm:1.5.0"
-  dependencies:
-    acorn: ^8.10.0
-    chokidar: ^3.5.3
-    webpack-sources: ^3.2.3
-    webpack-virtual-modules: ^0.5.0
-  checksum: fd3675aef99098741c2f0c4a33726d88230b60962fe9ceeb665e5596eb65e540e1e2d7a6e09132d821093e3d6918296c64311f73a947a9374f1b826017d05f63
-=======
   version: 1.5.1
   resolution: "unplugin@npm:1.5.1"
   dependencies:
@@ -29104,7 +26289,6 @@ __metadata:
     webpack-sources: ^3.2.3
     webpack-virtual-modules: ^0.6.0
   checksum: c93cb8526026986ac34d79d7ee8a7c4f8371272bccc5f7a3f64158eb9fa2e296eb65345bd97f60be8f075188fcb681843b1c039eb2002f9a4b400f74e2bbae19
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -29368,22 +26552,13 @@ __metadata:
   linkType: hard
 
 "v8-to-istanbul@npm:^9.0.1":
-<<<<<<< HEAD
-  version: 9.1.3
-  resolution: "v8-to-istanbul@npm:9.1.3"
-=======
   version: 9.2.0
   resolution: "v8-to-istanbul@npm:9.2.0"
->>>>>>> origin/main
   dependencies:
     "@jridgewell/trace-mapping": ^0.3.12
     "@types/istanbul-lib-coverage": ^2.0.1
     convert-source-map: ^2.0.0
-<<<<<<< HEAD
-  checksum: 5d592ab3d186b386065dace8e01c543a922a904b3cfac39667de172455a6b3d0e8e1401574fecb8a12092ad0809b5a8fd15f1cc14d0666139a1bb77cd6ac2cf8
-=======
   checksum: 31ef98c6a31b1dab6be024cf914f235408cd4c0dc56a5c744a5eea1a9e019ba279e1b6f90d695b78c3186feed391ed492380ccf095009e2eb91f3d058f0b4491
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -29476,15 +26651,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"vite@npm:^4.2.0, vite@npm:^4.4.4":
-  version: 4.5.0
-  resolution: "vite@npm:4.5.0"
-=======
 "vite@npm:^4.4.4, vite@npm:^4.5.1":
   version: 4.5.1
   resolution: "vite@npm:4.5.1"
->>>>>>> origin/main
   dependencies:
     esbuild: ^0.18.10
     fsevents: ~2.3.2
@@ -29518,11 +26687,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-<<<<<<< HEAD
-  checksum: 06f1a4c858e4dc4c04a10466f4ccacea30c5a9f8574e5ba3deb9d03fa20e80ca6797f02dad97a988da7cdef96238dbc69c3b6a538156585c74722d996223619e
-=======
   checksum: 72b3584b3d3b8d14e8a37f0248e47fb8b4d02ab35de5b5a8e5ca8ae55c3be2aab73760dc36edac4fa722de182f78cc492eb44888fcb4a9a0712c4605dad644f9
->>>>>>> origin/main
   languageName: node
   linkType: hard
 
@@ -29757,8 +26922,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-=======
 "webpack-virtual-modules@npm:^0.6.0":
   version: 0.6.1
   resolution: "webpack-virtual-modules@npm:0.6.1"
@@ -29766,7 +26929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
->>>>>>> origin/main
 "webpack@npm:5, webpack@npm:^5.75.0":
   version: 5.89.0
   resolution: "webpack@npm:5.89.0"
@@ -30000,24 +27162,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
-  version: 1.1.11
-  resolution: "which-typed-array@npm:1.1.11"
-  dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
-  languageName: node
-  linkType: hard
-
-"which-typed-array@npm:^1.1.13":
-=======
 "which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
->>>>>>> origin/main
   version: 1.1.13
   resolution: "which-typed-array@npm:1.1.13"
   dependencies:
@@ -30315,11 +27460,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"yaml@npm:^2.1.1":
-=======
 "yaml@npm:^2.1.1, yaml@npm:^2.3.4":
->>>>>>> origin/main
   version: 2.3.4
   resolution: "yaml@npm:2.3.4"
   checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8
@@ -30400,21 +27541,12 @@ __metadata:
   linkType: hard
 
 "yarn@npm:^1.22.10":
-<<<<<<< HEAD
-  version: 1.22.19
-  resolution: "yarn@npm:1.22.19"
-  bin:
-    yarn: bin/yarn.js
-    yarnpkg: bin/yarn.js
-  checksum: b43d2cc5fee7e933beb12a8aee7dfceca9e9ef2dd17c5d04d15a12ab7bec5f5744ea34a07b86e013da7f291a18c4e1ad8f70e150f5ed2f4666e6723c7f0a8452
-=======
   version: 1.22.21
   resolution: "yarn@npm:1.22.21"
   bin:
     yarn: bin/yarn.js
     yarnpkg: bin/yarn.js
   checksum: 791fab07ad55351049361686bcdd25c64a46e2afe2f2fc7587e666aa4f758d7eef80235b921aa09415557ac580ab23305c0181c1b43fed45f357a0c7a77322a1
->>>>>>> origin/main
   languageName: node
   linkType: hard
 

From 902e10d9a76eed6adae8e2a9aaf3fd802405168a Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Tue, 16 Jan 2024 10:30:59 +0100
Subject: [PATCH 30/68] Fix feil med at focus-indikator for input-feltet ikke
 ble vist

---
 @navikt/core/react/src/form/combobox/Combobox.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/Combobox.tsx b/@navikt/core/react/src/form/combobox/Combobox.tsx
index 42d155375f2..4f85cc728cc 100644
--- a/@navikt/core/react/src/form/combobox/Combobox.tsx
+++ b/@navikt/core/react/src/form/combobox/Combobox.tsx
@@ -1,17 +1,17 @@
 import cl from "clsx";
 import React, { forwardRef, useMemo, useRef } from "react";
+import { BodyShort, ErrorMessage, Label } from "../../typography";
+import { mergeRefs } from "../../util";
 import ClearButton from "./ClearButton";
+import ComboboxWrapper from "./ComboboxWrapper";
 import FilteredOptions from "./FilteredOptions/FilteredOptions";
 import { useFilteredOptionsContext } from "./FilteredOptions/filteredOptionsContext";
+import Input from "./Input/Input";
+import { useInputContext } from "./Input/inputContext";
 import SelectedOptions from "./SelectedOptions/SelectedOptions";
+import { useSelectedOptionsContext } from "./SelectedOptions/selectedOptionsContext";
 import ToggleListButton from "./ToggleListButton";
 import { ComboboxProps } from "./types";
-import { useSelectedOptionsContext } from "./SelectedOptions/selectedOptionsContext";
-import ComboboxWrapper from "./ComboboxWrapper";
-import { useInputContext } from "./Input/inputContext";
-import Input from "./Input/Input";
-import { mergeRefs } from "../../util";
-import { BodyShort, ErrorMessage, Label } from "../../typography";
 
 export const Combobox = forwardRef<
   HTMLInputElement,
@@ -92,7 +92,7 @@ export const Combobox = forwardRef<
             "navds-combobox__wrapper-inner navds-text-field__input",
             {
               "navds-combobox__wrapper-inner--virtually-unfocused":
-                activeDecendantId !== null,
+                activeDecendantId !== undefined,
             }
           )}
           onClick={focusInput}

From a6fa9e587d7a6af77224f40c4a77679d7d5220bd Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Tue, 16 Jan 2024 10:31:59 +0100
Subject: [PATCH 31/68] Forenkle og fikse "scroll til element" i
 FilteredOptions

---
 .../form/combobox/FilteredOptions/useVirtualFocus.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index 2d21ebc24b7..160d6973069 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -36,19 +36,9 @@ const useVirtualFocus = (
       getElementsAbleToReceiveFocus().length - 1
     : false;
 
-  const scrollToOption = (_element?: HTMLElement) => {
-    if (containerRef && _element) {
-      const { top, bottom } = _element.getBoundingClientRect();
-      const parentRect = containerRef.getBoundingClientRect();
-      if (top < parentRect.top || bottom > parentRect.bottom) {
-        _element.scrollIntoView({ block: "nearest" });
-      }
-    }
-  };
-
   const _moveFocusAndScrollTo = (_element?: HTMLElement) => {
     setActiveElement(_element);
-    scrollToOption(_element);
+    _element?.scrollIntoView({ block: "nearest" });
   };
 
   const moveFocusUp = () => {

From 26e72c57425f00a04ea38734ca6725de6daac0bc Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Tue, 16 Jan 2024 10:32:56 +0100
Subject: [PATCH 32/68] =?UTF-8?q?S=C3=B8rg=20for=20at=20disabled=20Filtere?=
 =?UTF-8?q?dOptions=20ikke=20vises=20under=20"max=20antall"-meldingen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @navikt/core/css/form/combobox.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index a2a3b7d070e..c62c2c7011a 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -234,6 +234,7 @@
   top: 0;
   left: 0;
   right: 0;
+  z-index: 1;
   gap: inherit;
   background-color: inherit;
   display: inherit;

From fdfb8c8afe6d72ca786ed0ccd4eb70bb1add72d5 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Tue, 16 Jan 2024 10:55:32 +0100
Subject: [PATCH 33/68] Focused option should not be covered by "max selected"
 message

---
 @navikt/core/css/form/combobox.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index c62c2c7011a..aa0911e702c 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -248,6 +248,7 @@
   padding: var(--a-spacing-3);
   width: 100%;
   background-color: var(--ac-combobox-list-item-bg, var(--a-surface-default));
+  scroll-margin-top: 50px;
 }
 
 .navds-form-field--small .navds-combobox__list-item,

From ff2562b5ca97244aeec1f344aa21c9cdf91ce51a Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 17 Jan 2024 13:20:43 +0100
Subject: [PATCH 34/68] yarn lock

---
 yarn.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c0db0b87c08..07936d9763d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3431,7 +3431,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@navikt/aksel-icons@^5.11.4, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
+"@navikt/aksel-icons@^5.12.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
   dependencies:
@@ -3458,8 +3458,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
   dependencies:
-    "@navikt/ds-css": ^5.11.4
-    "@navikt/ds-tokens": ^5.11.4
+    "@navikt/ds-css": ^5.12.0
+    "@navikt/ds-tokens": ^5.12.0
     "@types/jest": ^29.0.0
     concurrently: 7.2.1
     copyfiles: 2.4.1
@@ -3477,7 +3477,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel@workspace:@navikt/aksel"
   dependencies:
-    "@navikt/ds-css": 5.11.4
+    "@navikt/ds-css": 5.12.0
     "@types/inquirer": ^9.0.3
     "@types/jest": ^29.0.0
     axios: 1.6.0
@@ -3501,11 +3501,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-css@*, @navikt/ds-css@5.11.4, @navikt/ds-css@^5.11.4, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
+"@navikt/ds-css@*, @navikt/ds-css@5.12.0, @navikt/ds-css@^5.12.0, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-css@workspace:@navikt/core/css"
   dependencies:
-    "@navikt/ds-tokens": ^5.11.4
+    "@navikt/ds-tokens": ^5.12.0
     cssnano: 6.0.0
     fast-glob: 3.2.11
     lodash: 4.17.21
@@ -3518,13 +3518,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-react@*, @navikt/ds-react@^5.11.4, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
+"@navikt/ds-react@*, @navikt/ds-react@^5.12.0, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-react@workspace:@navikt/core/react"
   dependencies:
     "@floating-ui/react": 0.25.4
-    "@navikt/aksel-icons": ^5.11.4
-    "@navikt/ds-tokens": ^5.11.4
+    "@navikt/aksel-icons": ^5.12.0
+    "@navikt/ds-tokens": ^5.12.0
     "@radix-ui/react-tabs": 1.0.0
     "@radix-ui/react-toggle-group": 1.0.0
     "@testing-library/dom": 8.13.0
@@ -3558,11 +3558,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tailwind@^5.11.4, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
+"@navikt/ds-tailwind@^5.12.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
   dependencies:
-    "@navikt/ds-tokens": ^5.11.4
+    "@navikt/ds-tokens": ^5.12.0
     "@types/jest": ^29.0.0
     color: 4.2.3
     jest: ^29.0.0
@@ -3574,7 +3574,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tokens@^5.11.4, @navikt/ds-tokens@workspace:@navikt/core/tokens":
+"@navikt/ds-tokens@^5.12.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
   dependencies:
@@ -8570,11 +8570,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "aksel.nav.no@workspace:aksel.nav.no"
   dependencies:
-    "@navikt/aksel-icons": ^5.11.4
-    "@navikt/ds-css": ^5.11.4
-    "@navikt/ds-react": ^5.11.4
-    "@navikt/ds-tailwind": ^5.11.4
-    "@navikt/ds-tokens": ^5.11.4
+    "@navikt/aksel-icons": ^5.12.0
+    "@navikt/ds-css": ^5.12.0
+    "@navikt/ds-react": ^5.12.0
+    "@navikt/ds-tailwind": ^5.12.0
+    "@navikt/ds-tokens": ^5.12.0
     prettier-plugin-tailwindcss: ^0.2.3
   languageName: unknown
   linkType: soft

From 387f4fff2ffbdfd040b3932e81f57bacb98d7e12 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Jan 2024 14:51:37 +0100
Subject: [PATCH 35/68] Fix "scrollIntoView is not a function" error. Possibly
 needs to be checked for when it occurs, but I haven't figured it out yet

---
 .../react/src/form/combobox/FilteredOptions/useVirtualFocus.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index d8851b7f55e..f74d647fae5 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -38,7 +38,7 @@ const useVirtualFocus = (
 
   const _moveFocusAndScrollTo = (_element?: HTMLElement) => {
     setActiveElement(_element);
-    _element?.scrollIntoView({ block: "nearest" });
+    _element?.scrollIntoView?.({ block: "nearest" });
   };
 
   const moveFocusUp = () => {

From 5157a7ddec900774808a9e3d3c0ec8f2ba9c08d5 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Jan 2024 15:10:46 +0100
Subject: [PATCH 36/68] Loading indicator is no longer exposed as an option, so
 we have to just search for it by the accessible name.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Should have been able to use findByRole("graphics-document", { name: "Søker..." }), but that is currently broken:
https://github.com/testing-library/dom-testing-library/issues/1131
---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx | 8 ++++----
 @navikt/core/react/src/form/combobox/combobox.test.tsx    | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index abb890c9720..fbbedb49dff 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -67,7 +67,7 @@ const FilteredOptions = () => {
             id={filteredOptionsUtil.getIsLoadingId(id)}
             data-no-focus="true"
           >
-            <Loader aria-label="Søker..." />
+            <Loader title="Søker..." />
           </div>
         )}
         {!isLoading && filteredOptions.length === 0 && (
@@ -95,7 +95,7 @@ const FilteredOptions = () => {
                 activeDecendantId !== filteredOptionsUtil.getAddNewOptionId(id)
               ) {
                 virtualFocus.moveFocusToElement(
-                  filteredOptionsUtil.getAddNewOptionId(id)
+                  filteredOptionsUtil.getAddNewOptionId(id),
                 );
                 setIsMouseLastUsedInputDevice(true);
               }
@@ -112,7 +112,7 @@ const FilteredOptions = () => {
                 "navds-combobox__list-item__new-option--focus":
                   activeDecendantId ===
                   filteredOptionsUtil.getAddNewOptionId(id),
-              }
+              },
             )}
             role="option"
             aria-selected={false}
@@ -145,7 +145,7 @@ const FilteredOptions = () => {
                 filteredOptionsUtil.getOptionId(id, option)
               ) {
                 virtualFocus.moveFocusToElement(
-                  filteredOptionsUtil.getOptionId(id, option)
+                  filteredOptionsUtil.getOptionId(id, option),
                 );
                 setIsMouseLastUsedInputDevice(true);
               }
diff --git a/@navikt/core/react/src/form/combobox/combobox.test.tsx b/@navikt/core/react/src/form/combobox/combobox.test.tsx
index d892340b7d9..e5b4edf7836 100644
--- a/@navikt/core/react/src/form/combobox/combobox.test.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.test.tsx
@@ -74,9 +74,7 @@ describe("Render combobox", () => {
   it("Should show loading icon when loading (used for async search)", async () => {
     render(<App options={[]} isListOpen isLoading />);
 
-    expect(
-      await screen.findByRole("option", { name: "venter..." }),
-    ).toBeInTheDocument();
+    expect(await screen.findByText("Søker...")).toBeInTheDocument();
   });
 });
 

From 2a683c29c384620dedf74d7ca85c2ac9363409c9 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 17 Jan 2024 15:17:36 +0100
Subject: [PATCH 37/68] Aria-selected should not be placed on elements that are
 no longer role="option"

---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index fbbedb49dff..2a43016a1f5 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -52,7 +52,6 @@ const FilteredOptions = () => {
         {!canSelectMoreOptions && (
           <div
             className="sticky navds-combobox__list-item navds-combobox__list-item__max-selected"
-            aria-selected={false}
             id={`${id}-max-selected`}
             data-no-focus="true"
           >
@@ -63,7 +62,6 @@ const FilteredOptions = () => {
         {isLoading && (
           <div
             className="sticky navds-combobox__list-item navds-combobox__list-item__loading"
-            aria-selected={false}
             id={filteredOptionsUtil.getIsLoadingId(id)}
             data-no-focus="true"
           >
@@ -73,7 +71,6 @@ const FilteredOptions = () => {
         {!isLoading && filteredOptions.length === 0 && (
           <div
             className="sticky navds-combobox__list-item navds-combobox__list-item__no-options"
-            aria-selected={false}
             id={filteredOptionsUtil.getNoHitsId(id)}
             data-no-focus="true"
           >

From 54c34638419beea4092c9a000d157aa1535360d1 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 10:51:37 +0100
Subject: [PATCH 38/68] Combine all "max selected options"-related props in one
 object

---
 .../src/form/combobox/ComboboxProvider.tsx    |  6 ++---
 .../FilteredOptions/FilteredOptions.tsx       | 20 ++++++----------
 .../selectedOptionsContext.tsx                | 23 ++++++++----------
 .../src/form/combobox/combobox.stories.tsx    |  2 +-
 @navikt/core/react/src/form/combobox/types.ts | 24 ++++++++++---------
 5 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
index 3e496751adf..486c570b297 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxProvider.tsx
@@ -43,8 +43,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
       isMultiSelect,
       onToggleSelected,
       selectedOptions,
-      maxSelectedOptions,
-      maxSelectedMessage,
+      maxSelected,
       options,
       value,
       onChange,
@@ -73,8 +72,7 @@ const ComboboxProvider = forwardRef<HTMLInputElement, ComboboxProps>(
               allowNewValues,
               isMultiSelect,
               selectedOptions,
-              maxSelectedOptions,
-              maxSelectedMessage,
+              maxSelected,
               onToggleSelected,
               options,
             }}
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 14af6a97634..08a052ee594 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -27,17 +27,11 @@ const FilteredOptions = () => {
     activeDecendantId,
     virtualFocus,
   } = useFilteredOptionsContext();
-  const {
-    canSelectMoreOptions,
-    isMultiSelect,
-    selectedOptions,
-    toggleOption,
-    maxSelectedOptions,
-    maxSelectedMessage,
-  } = useSelectedOptionsContext();
+  const { isMultiSelect, selectedOptions, toggleOption, maxSelected } =
+    useSelectedOptionsContext();
 
   const isDisabled = (option) =>
-    !canSelectMoreOptions && !selectedOptions.includes(option);
+    maxSelected?.isLimitReached && !selectedOptions.includes(option);
 
   return (
     <div
@@ -49,15 +43,15 @@ const FilteredOptions = () => {
       tabIndex={-1}
     >
       <div className="navds-combobox__list_non-selectables">
-        {!canSelectMoreOptions && (
+        {maxSelected?.isLimitReached && (
           <div
             className="navds-combobox__list-item navds-combobox__list-item__max-selected sticky"
             aria-selected={false}
             id={`${id}-max-selected`}
             data-no-focus="true"
           >
-            {maxSelectedMessage ??
-              `${selectedOptions.length} av ${maxSelectedOptions} er valgt.`}
+            {maxSelected.message ??
+              `${selectedOptions.length} av ${maxSelected.limit} er valgt.`}
           </div>
         )}
         {isLoading && (
@@ -87,7 +81,7 @@ const FilteredOptions = () => {
         role="listbox"
         className="navds-combobox__list-options"
       >
-        {isValueNew && canSelectMoreOptions && allowNewValues && (
+        {isValueNew && !maxSelected?.isLimitReached && allowNewValues && (
           <li
             tabIndex={-1}
             onMouseMove={() => {
diff --git a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
index 213b3b4ad26..c6c1ab15e14 100644
--- a/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/SelectedOptions/selectedOptionsContext.tsx
@@ -8,18 +8,16 @@ import React, {
 import { usePrevious } from "../../../util/hooks";
 import { useInputContext } from "../Input/inputContext";
 import { useCustomOptionsContext } from "../customOptionsContext";
-import { ComboboxProps } from "../types";
+import { ComboboxProps, MaxSelected } from "../types";
 
 type SelectedOptionsContextType = {
   addSelectedOption: (option: string) => void;
-  canSelectMoreOptions: boolean;
   isMultiSelect?: boolean;
   removeSelectedOption: (option: string) => void;
   prevSelectedOptions?: string[];
   selectedOptions: string[];
-  maxSelectedOptions?: number;
+  maxSelected?: MaxSelected & { isLimitReached: boolean };
   setSelectedOptions: (any) => void;
-  maxSelectedMessage?: string;
   toggleOption: (
     option: string,
     event: React.KeyboardEvent | React.PointerEvent,
@@ -42,8 +40,7 @@ export const SelectedOptionsProvider = ({
     | "options"
     | "selectedOptions"
     | "onToggleSelected"
-    | "maxSelectedOptions"
-    | "maxSelectedMessage"
+    | "maxSelected"
   >;
 }) => {
   const { clearInput, focusInput } = useInputContext();
@@ -59,8 +56,7 @@ export const SelectedOptionsProvider = ({
     selectedOptions: externalSelectedOptions,
     onToggleSelected,
     options,
-    maxSelectedOptions,
-    maxSelectedMessage,
+    maxSelected,
   } = value;
   const [internalSelectedOptions, setSelectedOptions] = useState<string[]>([]);
   const selectedOptions = useMemo(
@@ -136,20 +132,21 @@ export const SelectedOptionsProvider = ({
 
   const prevSelectedOptions = usePrevious<string[]>(selectedOptions);
 
-  const canSelectMoreOptions =
-    !maxSelectedOptions || selectedOptions.length < maxSelectedOptions;
+  const isLimitReached =
+    !!maxSelected?.limit && selectedOptions.length >= maxSelected.limit;
 
   const selectedOptionsState = {
     addSelectedOption,
-    canSelectMoreOptions,
     isMultiSelect,
     removeSelectedOption,
     prevSelectedOptions,
     selectedOptions,
     setSelectedOptions,
     toggleOption,
-    maxSelectedOptions,
-    maxSelectedMessage,
+    maxSelected: maxSelected && {
+      ...maxSelected,
+      isLimitReached,
+    },
   };
 
   return (
diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index ecd1594bee3..5acec77b883 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -301,7 +301,7 @@ export const MaxSelectedOptions: StoryFunction = () => {
       id={id}
       label="Komboboks med begrenset antall valg"
       options={options}
-      maxSelectedOptions={2}
+      maxSelected={{ limit: 2 }}
       selectedOptions={selectedOptions}
       onToggleSelected={(option, isSelected) =>
         isSelected
diff --git a/@navikt/core/react/src/form/combobox/types.ts b/@navikt/core/react/src/form/combobox/types.ts
index 6c889bd824a..bc5d51e13de 100644
--- a/@navikt/core/react/src/form/combobox/types.ts
+++ b/@navikt/core/react/src/form/combobox/types.ts
@@ -1,6 +1,17 @@
 import React, { ChangeEvent, InputHTMLAttributes } from "react";
 import { FormFieldProps } from "../useFormField";
 
+export type MaxSelected = {
+  /**
+   * The limit for maximum selected options
+   */
+  limit: number;
+  /**
+   * Override the message to display when the limit for maximum selected options has been reached
+   */
+  message?: string;
+};
+
 export interface ComboboxProps
   extends FormFieldProps,
     Omit<InputHTMLAttributes<HTMLInputElement>, "size" | "onChange" | "value"> {
@@ -98,18 +109,9 @@ export interface ComboboxProps
    */
   selectedOptions?: string[];
   /**
-   * Maximum number of selected options.
-   * If set, the remaining options will be disabled when the limit is reached.
-   */
-  maxSelectedOptions?: number;
-  /**
-   * Message to display when the maximum number of selected options is reached.
-   *
-   * @param current - The current number of selected options
-   * @param max - The maximum number of selected options
-   * @returns The string / interpolated string to display
+   * Options for the maximum number of selected options.
    */
-  maxSelectedMessage?: string;
+  maxSelected?: MaxSelected;
   /**
    * Set to "true" to enable inline autocomplete.
    *

From 28707f15aee1a019cf6d7fc66562061493743a5a Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 11:02:25 +0100
Subject: [PATCH 39/68] Proper BEM syntax should use -- instead of __ for
 state-like classes, like --loading, --max-selected and --new-option

---
 @navikt/core/css/form/combobox.css            | 28 +++++++++----------
 .../FilteredOptions/FilteredOptions.tsx       | 10 +++----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 973c6086317..7a63e5e3961 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -264,30 +264,30 @@
 }
 
 .navds-form-field--small .navds-combobox__list-item,
-.navds-form-field--small .navds-combobox__list-item__no-options,
-.navds-form-field--small .navds-combobox__list-item__new-option {
+.navds-form-field--small .navds-combobox__list-item--no-options,
+.navds-form-field--small .navds-combobox__list-item--new-option {
   padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
 }
 
-.navds-combobox__list-item__loading {
+.navds-combobox__list-item--loading {
   justify-content: center;
   background-color: var(--ac-combobox-list-item-loading-bg, var(--a-surface-default));
 }
 
-.navds-combobox__list-item__max-selected {
+.navds-combobox__list-item--max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
   border-radius: 3px 3px 0 0; /* TODO: Change to default 4px border-radius when we refactor styling of dropdown */
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }
 
-.navds-combobox__list-item__max-selected + li {
+.navds-combobox__list-item--max-selected + li {
   margin-top: 0;
 }
 
-.navds-combobox__list-item__no-options:hover,
-.navds-combobox__list-item__loading:hover,
-.navds-combobox__list-item__max-selected:hover {
+.navds-combobox__list-item--no-options:hover,
+.navds-combobox__list-item--loading:hover,
+.navds-combobox__list-item--max-selected:hover {
   cursor: default;
 }
 
@@ -327,9 +327,9 @@
 }
 
 .navds-combobox__list-item:not(
-    .navds-combobox__list-item__max-selected,
-    .navds-combobox__list-item__loading,
-    .navds-combobox__list-item__no-options
+    .navds-combobox__list-item--max-selected,
+    .navds-combobox__list-item--loading,
+    .navds-combobox__list-item--no-options
   )[data-no-focus="true"] {
   cursor: not-allowed;
   opacity: 0.4;
@@ -350,7 +350,7 @@
   padding-left: calc(var(--a-spacing-3) - 4px);
 }
 
-.navds-combobox__list-item__new-option {
+.navds-combobox__list-item--new-option {
   border-bottom: 1px solid var(--a-border-divider);
   background: var(--a-surface-neutral-subtle);
   cursor: pointer;
@@ -358,12 +358,12 @@
   gap: 0.25rem;
 }
 
-.navds-combobox__list--with-hover .navds-combobox__list-item__new-option:hover {
+.navds-combobox__list--with-hover .navds-combobox__list-item--new-option:hover {
   border-bottom: 1px solid var(--a-border-divider);
   background: var(--a-surface-neutral-subtle-hover);
 }
 
-.navds-combobox__list-item__new-option--focus {
+.navds-combobox__list-item--new-option--focus {
   box-shadow:
     var(--a-shadow-focus) inset,
     var(--a-border-action) 0 0 0 5px inset;
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 08a052ee594..4241c2f4a70 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -45,7 +45,7 @@ const FilteredOptions = () => {
       <div className="navds-combobox__list_non-selectables">
         {maxSelected?.isLimitReached && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item__max-selected sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--max-selected sticky"
             aria-selected={false}
             id={`${id}-max-selected`}
             data-no-focus="true"
@@ -56,7 +56,7 @@ const FilteredOptions = () => {
         )}
         {isLoading && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item__loading sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--loading sticky"
             aria-selected={false}
             id={filteredOptionsUtil.getIsLoadingId(id)}
             data-no-focus="true"
@@ -66,7 +66,7 @@ const FilteredOptions = () => {
         )}
         {!isLoading && filteredOptions.length === 0 && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item__no-options sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--no-options sticky"
             aria-selected={false}
             id={filteredOptionsUtil.getNoHitsId(id)}
             data-no-focus="true"
@@ -101,9 +101,9 @@ const FilteredOptions = () => {
             }}
             id={filteredOptionsUtil.getAddNewOptionId(id)}
             className={cl(
-              "navds-combobox__list-item navds-combobox__list-item__new-option",
+              "navds-combobox__list-item navds-combobox__list-item--new-option",
               {
-                "navds-combobox__list-item__new-option--focus":
+                "navds-combobox__list-item--new-option--focus":
                   activeDecendantId ===
                   filteredOptionsUtil.getAddNewOptionId(id),
               },

From aa13c36c5120d5a6b6289b467d871586e682ffa9 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 11:18:47 +0100
Subject: [PATCH 40/68] Always show selected options in FilteredOptions, even
 if they don't match the search text

---
 .../FilteredOptions/filtered-options-util.ts     |  7 +++++--
 .../FilteredOptions/filteredOptionsContext.tsx   | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
index f3a45e80021..62bed77578c 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
@@ -7,8 +7,11 @@ const isPartOfText = (value, text) =>
 const isValueInList = (value, list) =>
   list?.find((listItem) => normalizeText(value) === normalizeText(listItem));
 
-const getMatchingValuesFromList = (value, list) =>
-  list?.filter((listItem) => isPartOfText(value, listItem));
+const getMatchingValuesFromList = (value, list, alwaysIncluded) =>
+  list?.filter(
+    (listItem) =>
+      isPartOfText(value, listItem) || alwaysIncluded.includes(listItem),
+  );
 
 const getFilteredOptionsId = (comboboxId: string) =>
   `${comboboxId}-filtered-options`;
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
index fe3536f38ad..79f4dc68517 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
@@ -9,6 +9,7 @@ import React, {
 } from "react";
 import { useClientLayoutEffect, usePrevious } from "../../../util/hooks";
 import { useInputContext } from "../Input/inputContext";
+import { useSelectedOptionsContext } from "../SelectedOptions/selectedOptionsContext";
 import { useCustomOptionsContext } from "../customOptionsContext";
 import { ComboboxProps } from "../types";
 import filteredOptionsUtils from "./filtered-options-util";
@@ -70,6 +71,7 @@ export const FilteredOptionsProvider = ({
     setSearchTerm,
     shouldAutocomplete,
   } = useInputContext();
+  const { selectedOptions } = useSelectedOptionsContext();
 
   const [isInternalListOpen, setInternalListOpen] = useState(false);
   const { customOptions } = useCustomOptionsContext();
@@ -79,8 +81,18 @@ export const FilteredOptionsProvider = ({
       return externalFilteredOptions;
     }
     const opts = [...customOptions, ...options];
-    return filteredOptionsUtils.getMatchingValuesFromList(searchTerm, opts);
-  }, [customOptions, externalFilteredOptions, options, searchTerm]);
+    return filteredOptionsUtils.getMatchingValuesFromList(
+      searchTerm,
+      opts,
+      selectedOptions,
+    );
+  }, [
+    customOptions,
+    externalFilteredOptions,
+    options,
+    searchTerm,
+    selectedOptions,
+  ]);
 
   const previousSearchTerm = usePrevious(searchTerm);
 

From 89d95fa840b88ae08c30d9f2c38f8268483a41ac Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 11:30:43 +0100
Subject: [PATCH 41/68] Only to the getElementsAbleToReceiveFocus() call once
 per function, to reduce DOM lookups. Also changed isFocusOnThe[Top | Bottom]
 to functions, because it was needed for isFocusOnTheBottom to follow the same
 rule (and not store the value on the top level in the hook.

---
 .../FilteredOptions/useVirtualFocus.ts        | 48 ++++++++++---------
 .../react/src/form/combobox/Input/Input.tsx   |  2 +-
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
index f74d647fae5..4fd5eafbfdb 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/useVirtualFocus.ts
@@ -3,8 +3,8 @@ import { useState } from "react";
 export type VirtualFocusType = {
   activeElement: HTMLElement | undefined;
   getElementById: (id: string) => HTMLElement | undefined;
-  isFocusOnTheTop: boolean;
-  isFocusOnTheBottom: boolean;
+  isFocusOnTheTop: () => boolean;
+  isFocusOnTheBottom: () => boolean;
   moveFocusUp: () => void;
   moveFocusDown: () => void;
   moveFocusToElement: (id: string) => void;
@@ -28,13 +28,17 @@ const useVirtualFocus = (
 
   const getElementById = (id: string) =>
     getListOfAllChildren().find((element) => element.id === id);
-  const isFocusOnTheTop = activeElement
-    ? getElementsAbleToReceiveFocus().indexOf(activeElement) === 0
-    : false;
-  const isFocusOnTheBottom = activeElement
-    ? getElementsAbleToReceiveFocus().indexOf(activeElement) ===
-      getElementsAbleToReceiveFocus().length - 1
-    : false;
+  const isFocusOnTheTop = () =>
+    activeElement
+      ? getElementsAbleToReceiveFocus().indexOf(activeElement) === 0
+      : false;
+  const isFocusOnTheBottom = () => {
+    const elementsAbleToReceiveFocus = getElementsAbleToReceiveFocus();
+    return activeElement
+      ? elementsAbleToReceiveFocus.indexOf(activeElement) ===
+          elementsAbleToReceiveFocus.length - 1
+      : false;
+  };
 
   const _moveFocusAndScrollTo = (_element?: HTMLElement) => {
     setActiveElement(_element);
@@ -45,9 +49,9 @@ const useVirtualFocus = (
     if (!activeElement) {
       return;
     }
-    const _currentIndex =
-      getElementsAbleToReceiveFocus().indexOf(activeElement);
-    const elementAbove = getElementsAbleToReceiveFocus()[_currentIndex - 1];
+    const elementsAbleToReceiveFocus = getElementsAbleToReceiveFocus();
+    const _currentIndex = elementsAbleToReceiveFocus.indexOf(activeElement);
+    const elementAbove = elementsAbleToReceiveFocus[_currentIndex - 1];
     if (_currentIndex === 0) {
       setActiveElement(undefined);
     } else {
@@ -56,26 +60,26 @@ const useVirtualFocus = (
   };
 
   const moveFocusDown = () => {
+    const elementsAbleToReceiveFocus = getElementsAbleToReceiveFocus();
     if (!activeElement) {
-      _moveFocusAndScrollTo(getElementsAbleToReceiveFocus()[0]);
+      _moveFocusAndScrollTo(elementsAbleToReceiveFocus[0]);
       return;
     }
-    const _currentIndex =
-      getElementsAbleToReceiveFocus().indexOf(activeElement);
-    if (_currentIndex === getElementsAbleToReceiveFocus().length - 1) {
+    const _currentIndex = elementsAbleToReceiveFocus.indexOf(activeElement);
+    if (_currentIndex === elementsAbleToReceiveFocus.length - 1) {
       return;
     } else {
-      _moveFocusAndScrollTo(getElementsAbleToReceiveFocus()[_currentIndex + 1]);
+      _moveFocusAndScrollTo(elementsAbleToReceiveFocus[_currentIndex + 1]);
     }
   };
 
   const moveFocusToTop = () => _moveFocusAndScrollTo(undefined);
-  const moveFocusToBottom = () =>
-    _moveFocusAndScrollTo(
-      getElementsAbleToReceiveFocus()[
-        getElementsAbleToReceiveFocus().length - 1
-      ],
+  const moveFocusToBottom = () => {
+    const elementsAbleToReceiveFocus = getElementsAbleToReceiveFocus();
+    return _moveFocusAndScrollTo(
+      elementsAbleToReceiveFocus[elementsAbleToReceiveFocus.length - 1],
     );
+  };
   const moveFocusToElement = (id: string) => {
     const _element = getElementsAbleToReceiveFocus().find(
       (_focusableElement) => _focusableElement.getAttribute("id") === id,
diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index a8927711b48..122309095dc 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -135,7 +135,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
           // Otherwise ignore keystrokes, so it doesn't interfere with text editing
           if (isListOpen && activeDecendantId) {
             e.preventDefault();
-            if (virtualFocus.isFocusOnTheTop) {
+            if (virtualFocus.isFocusOnTheTop()) {
               toggleIsListOpen(false);
             }
             virtualFocus.moveFocusUp();

From ab3e9d0ce66cdec9ac8891c0a0710e7fa7c749a2 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 11:37:56 +0100
Subject: [PATCH 42/68] Pressing "End" should not only move focus to the end of
 the list, but also open the list if it is closed. To mirror this, we close
 the list if moving focus back to the Input with "Home".

---
 @navikt/core/react/src/form/combobox/Input/Input.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/@navikt/core/react/src/form/combobox/Input/Input.tsx b/@navikt/core/react/src/form/combobox/Input/Input.tsx
index 122309095dc..a19c0b24b58 100644
--- a/@navikt/core/react/src/form/combobox/Input/Input.tsx
+++ b/@navikt/core/react/src/form/combobox/Input/Input.tsx
@@ -101,9 +101,11 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
           onEnter(e);
           break;
         case "Home":
+          toggleIsListOpen(false);
           virtualFocus.moveFocusToTop();
           break;
         case "End":
+          toggleIsListOpen(true);
           virtualFocus.moveFocusToBottom();
           break;
         default:

From a934a7bea4ffff160d34672b92ff62db9b91d6b4 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Mon, 22 Jan 2024 11:51:45 +0100
Subject: [PATCH 43/68] Legg til Aksel-eksempel

---
 .../combobox/with-max-selected-limit.tsx      | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx

diff --git a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
new file mode 100644
index 00000000000..3f2949efbd6
--- /dev/null
+++ b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
@@ -0,0 +1,49 @@
+import { UNSAFE_Combobox } from "@navikt/ds-react";
+import { withDsExample } from "@/web/examples/withDsExample";
+import { useState } from "react";
+
+const Example = () => {
+  const [selectedOptions, setSelectedOptions] = useState([
+    options[0],
+    options[1],
+  ]);
+  return (
+    <div>
+      <UNSAFE_Combobox
+        label="Hva er de kuleste transportmidlene? (velg opp til 3)"
+        options={options}
+        isMultiSelect
+        maxSelected={{ limit: 3 }}
+        selectedOptions={["car", "bus", "train"]}
+        onToggleSelected={(option, isSelected) =>
+          isSelected
+            ? setSelectedOptions([...selectedOptions, option])
+            : setSelectedOptions(selectedOptions.filter((o) => o !== option))
+        }
+      />
+    </div>
+  );
+};
+
+const options = [
+  "car",
+  "bus",
+  "train",
+  "skateboard",
+  "bicycle",
+  "motorcycle",
+  "boat",
+  "airplane",
+  "helicopter",
+  "truck",
+  "van",
+  "scooter",
+];
+
+// EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
+export default withDsExample(Example, { variant: "static" });
+
+export const args = {
+  index: 1,
+  desc: "Ved å sette en grense for maks antall valgte vil brukeren få opp en beskjed om at hen ikke kan velge flere når grensen er nådd. Resterende valg vil også bli inaktive.",
+};

From 6aa78bc7a26ab1e8f5ab7811bcffd68a9ccf3c24 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 24 Jan 2024 09:30:08 +0100
Subject: [PATCH 44/68] yarn changeset

---
 .changeset/red-crabs-sell.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/red-crabs-sell.md

diff --git a/.changeset/red-crabs-sell.md b/.changeset/red-crabs-sell.md
new file mode 100644
index 00000000000..457cdb8303f
--- /dev/null
+++ b/.changeset/red-crabs-sell.md
@@ -0,0 +1,6 @@
+---
+"@navikt/ds-react": minor
+"@navikt/ds-css": minor
+---
+
+:sparkles: Combobox: Mulighet for å begrense hvor mange valg bruker kan ta

From baae7c998ea9ccc5a1d723fb751ee95368edead1 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 24 Jan 2024 09:40:25 +0100
Subject: [PATCH 45/68] Update @navikt/core/css/form/combobox.css

---
 @navikt/core/css/form/combobox.css | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 7a63e5e3961..da3f0d72f33 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -305,13 +305,6 @@
   align-items: flex-start;
 }
 
-/* 
-.navds-combobox__list {
-  overflow-y: auto;
-  border: 1px solid var(--ac-combobox-list-border-color, var(--a-border-divider));
-  box-shadow: var(--a-shadow-small);
-}
-*/
 
 .navds-combobox__list-item--focus,
 .navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {

From 56253bfbdbc56fea2dc47e8e9e258ca05d16948d Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Wed, 24 Jan 2024 09:46:18 +0100
Subject: [PATCH 46/68] change 'maxSelectedOptions' prop to 'maxSelected'

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index 5acec77b883..e6d82d3b4a4 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -44,7 +44,7 @@ Default.argTypes = {
   isListOpen: {
     control: { type: "boolean" },
   },
-  maxSelectedOptions: {
+  maxSelected: {
     control: { type: "number" },
   },
   size: {

From 161c05addff6f1d7e979f4bba74a7483e96e5e7b Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 24 Jan 2024 09:55:58 +0100
Subject: [PATCH 47/68] Mark disabled options with aria-disabled

---
 .../react/src/form/combobox/FilteredOptions/FilteredOptions.tsx  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 4241c2f4a70..303be5b469a 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -154,6 +154,7 @@ const FilteredOptions = () => {
             }}
             role="option"
             aria-selected={selectedOptions.includes(option)}
+            aria-disabled={isDisabled(option) || undefined}
           >
             <BodyShort size={size}>{option}</BodyShort>
             {selectedOptions.includes(option) && <CheckmarkIcon />}

From 2ad256de9c8ee4e285117f8f24817fdcfa50c309 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 24 Jan 2024 11:45:15 +0100
Subject: [PATCH 48/68] Add max selected text to aria-describedby, so it is
 announced when the user enters the input field

---
 .../form/combobox/FilteredOptions/FilteredOptions.tsx |  2 +-
 .../combobox/FilteredOptions/filtered-options-util.ts |  4 ++++
 .../FilteredOptions/filteredOptionsContext.tsx        | 11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 303be5b469a..edb0faed981 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -47,7 +47,7 @@ const FilteredOptions = () => {
           <div
             className="navds-combobox__list-item navds-combobox__list-item--max-selected sticky"
             aria-selected={false}
-            id={`${id}-max-selected`}
+            id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
             data-no-focus="true"
           >
             {maxSelected.message ??
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts b/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
index 62bed77578c..af99b274977 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/filtered-options-util.ts
@@ -28,6 +28,9 @@ const getIsLoadingId = (comboboxId: string) => `${comboboxId}-is-loading`;
 
 const getNoHitsId = (comboboxId: string) => `${comboboxId}-no-hits`;
 
+const getMaxSelectedOptionsId = (comboboxId: string) =>
+  `${comboboxId}-max-selected-options`;
+
 export default {
   normalizeText,
   isPartOfText,
@@ -38,4 +41,5 @@ export default {
   getOptionId,
   getIsLoadingId,
   getNoHitsId,
+  getMaxSelectedOptionsId,
 };
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
index 79f4dc68517..e67d52020e4 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/filteredOptionsContext.tsx
@@ -71,7 +71,7 @@ export const FilteredOptionsProvider = ({
     setSearchTerm,
     shouldAutocomplete,
   } = useInputContext();
-  const { selectedOptions } = useSelectedOptionsContext();
+  const { selectedOptions, maxSelected } = useSelectedOptionsContext();
 
   const [isInternalListOpen, setInternalListOpen] = useState(false);
   const { customOptions } = useCustomOptionsContext();
@@ -166,10 +166,17 @@ export const FilteredOptionsProvider = ({
         activeOption = filteredOptionsUtils.getIsLoadingId(id);
       }
     }
-    return cl(activeOption, partialAriaDescribedBy) || undefined;
+    const maybeMaxSelectedOptionsId =
+      maxSelected?.isLimitReached &&
+      filteredOptionsUtils.getMaxSelectedOptionsId(id);
+    return (
+      cl(activeOption, maybeMaxSelectedOptionsId, partialAriaDescribedBy) ||
+      undefined
+    );
   }, [
     isListOpen,
     isLoading,
+    maxSelected?.isLimitReached,
     value,
     partialAriaDescribedBy,
     shouldAutocomplete,

From 820efcaf073056cb1299b14e41281faa181b494d Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 24 Jan 2024 11:46:09 +0100
Subject: [PATCH 49/68] Add role="status" to the wrapper for "no hits",
 "loading" and "max selected" info messages, so they are announced when they
 appear

---
 .../react/src/form/combobox/FilteredOptions/FilteredOptions.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index edb0faed981..eff781548f5 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -42,7 +42,7 @@ const FilteredOptions = () => {
       id={filteredOptionsUtil.getFilteredOptionsId(id)}
       tabIndex={-1}
     >
-      <div className="navds-combobox__list_non-selectables">
+      <div className="navds-combobox__list_non-selectables" role="status">
         {maxSelected?.isLimitReached && (
           <div
             className="navds-combobox__list-item navds-combobox__list-item--max-selected sticky"

From 04398da6ded4efe7e216899a02b463b7958c3a3e Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Wed, 24 Jan 2024 11:46:26 +0100
Subject: [PATCH 50/68] Remove aria-selected (again)

---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index eff781548f5..d7a830fa6dc 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -46,7 +46,6 @@ const FilteredOptions = () => {
         {maxSelected?.isLimitReached && (
           <div
             className="navds-combobox__list-item navds-combobox__list-item--max-selected sticky"
-            aria-selected={false}
             id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
             data-no-focus="true"
           >
@@ -57,7 +56,6 @@ const FilteredOptions = () => {
         {isLoading && (
           <div
             className="navds-combobox__list-item navds-combobox__list-item--loading sticky"
-            aria-selected={false}
             id={filteredOptionsUtil.getIsLoadingId(id)}
             data-no-focus="true"
           >
@@ -67,7 +65,6 @@ const FilteredOptions = () => {
         {!isLoading && filteredOptions.length === 0 && (
           <div
             className="navds-combobox__list-item navds-combobox__list-item--no-options sticky"
-            aria-selected={false}
             id={filteredOptionsUtil.getNoHitsId(id)}
             data-no-focus="true"
           >

From 54e0e9e2684f2031b1a642db05c153997fe32c9b Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Thu, 25 Jan 2024 10:30:21 +0100
Subject: [PATCH 51/68] fix: form error not showing correctly

---
 @navikt/core/css/form/combobox.css                       | 3 +--
 @navikt/core/react/src/form/combobox/ComboboxWrapper.tsx | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index da3f0d72f33..feb2e00036e 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -1,4 +1,4 @@
-.navds-combobox-form-field {
+.navds-combobox-wrapper {
   display: flex;
   flex-direction: column;
 }
@@ -305,7 +305,6 @@
   align-items: flex-start;
 }
 
-
 .navds-combobox__list-item--focus,
 .navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
diff --git a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
index 08443a24476..1458824fdb9 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
@@ -47,7 +47,8 @@ const ComboboxWrapper = ({
       ref={wrapperRef}
       className={cl(
         className,
-        "navds-combobox-form-field",
+        "navds-combobox-wrapper",
+        "navds-form-field",
         `navds-form-field--${inputSize}`,
         {
           "navds-combobox--error": hasError,

From 08a68333f2d28a05f4454c3d5d6bb7251facde04 Mon Sep 17 00:00:00 2001
From: Lars Hansen <lars.eirik.korsgaard.hansen@nav.no>
Date: Thu, 25 Jan 2024 10:41:51 +0100
Subject: [PATCH 52/68] fix: rm left hover-border on add-new-option item

---
 @navikt/core/css/form/combobox.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index feb2e00036e..ed0647c448e 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -306,7 +306,8 @@
 }
 
 .navds-combobox__list-item--focus,
-.navds-combobox__list--with-hover .navds-combobox__list-item:not([data-no-focus="true"]):hover {
+.navds-combobox__list--with-hover
+  .navds-combobox__list-item:not([data-no-focus="true"], .navds-combobox__list-item--new-option):hover {
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
   cursor: pointer;
   border-left: 4px solid var(--ac-combobox-list-item-hover-border-left, var(--a-border-strong));

From 49b7b50af4a2ec6c1867298d3b5cb60a917fca94 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:34:34 +0100
Subject: [PATCH 53/68] =?UTF-8?q?Bare=20=C3=A5pne=20listen=20som=20default?=
 =?UTF-8?q?,=20men=20la=20intern=20logikk=20styre=20etter=20f=C3=B8rste=20?=
 =?UTF-8?q?render?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @navikt/core/react/src/form/combobox/combobox.stories.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/combobox.stories.tsx b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
index e6d82d3b4a4..686b37a356b 100644
--- a/@navikt/core/react/src/form/combobox/combobox.stories.tsx
+++ b/@navikt/core/react/src/form/combobox/combobox.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryFn, StoryObj } from "@storybook/react";
 import { expect, fn, userEvent, within } from "@storybook/test";
-import React, { useId, useMemo, useState } from "react";
+import React, { useId, useMemo, useRef, useState } from "react";
 import { Chips, ComboboxProps, TextField, UNSAFE_Combobox } from "../../index";
 
 export default {
@@ -296,6 +296,7 @@ export const MaxSelectedOptions: StoryFunction = () => {
     options[0],
     options[1],
   ]);
+  const comboboxRef = useRef<HTMLInputElement>(null);
   return (
     <UNSAFE_Combobox
       id={id}
@@ -310,9 +311,10 @@ export const MaxSelectedOptions: StoryFunction = () => {
       }
       isMultiSelect
       allowNewValues
-      isListOpen
+      isListOpen={comboboxRef.current ? undefined : true}
       value={value}
       onChange={(event) => setValue(event?.target.value)}
+      ref={comboboxRef}
     />
   );
 };

From 90534f25df327790d7b7c8ff87d795dd4b1563d0 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:35:12 +0100
Subject: [PATCH 54/68] =?UTF-8?q?Sticky=20trenger=20ikke=20ligger=20p?=
 =?UTF-8?q?=C3=A5=20hver=20enkelt=20av=20disse,=20da=20parent=20wrapperen?=
 =?UTF-8?q?=20ogs=C3=A5=20er=20sticky?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/combobox/FilteredOptions/FilteredOptions.tsx    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index d7a830fa6dc..f77b40710aa 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -45,9 +45,8 @@ const FilteredOptions = () => {
       <div className="navds-combobox__list_non-selectables" role="status">
         {maxSelected?.isLimitReached && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item--max-selected sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--max-selected"
             id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
-            data-no-focus="true"
           >
             {maxSelected.message ??
               `${selectedOptions.length} av ${maxSelected.limit} er valgt.`}
@@ -55,18 +54,16 @@ const FilteredOptions = () => {
         )}
         {isLoading && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item--loading sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--loading"
             id={filteredOptionsUtil.getIsLoadingId(id)}
-            data-no-focus="true"
           >
             <Loader title="Søker..." />
           </div>
         )}
         {!isLoading && filteredOptions.length === 0 && (
           <div
-            className="navds-combobox__list-item navds-combobox__list-item--no-options sticky"
+            className="navds-combobox__list-item navds-combobox__list-item--no-options"
             id={filteredOptionsUtil.getNoHitsId(id)}
-            data-no-focus="true"
           >
             Ingen søketreff
           </div>

From ffd2c2e21dcc7df846f4111ec5f7c125a37342f3 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:36:42 +0100
Subject: [PATCH 55/68] =?UTF-8?q?Combobox=20eksempler=20var=20ikke=20tilgj?=
 =?UTF-8?q?engelig=20i=20`yarn=20storybook:aksel`=20p=C3=A5=20grunn=20av?=
 =?UTF-8?q?=20manglende=20Demo-eksport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/eksempler/combobox/multi-select-controlled.tsx   | 5 +++++
 .../eksempler/combobox/multi-select-with-new-options.tsx   | 5 +++++
 .../website/pages/eksempler/combobox/multi-select.tsx      | 5 +++++
 .../eksempler/combobox/single-select-with-autocomplete.tsx | 5 +++++
 .../website/pages/eksempler/combobox/single-select.tsx     | 5 +++++
 .../website/pages/eksempler/combobox/with-error.tsx        | 5 +++++
 .../pages/eksempler/combobox/with-max-selected-limit.tsx   | 7 ++++++-
 7 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/aksel.nav.no/website/pages/eksempler/combobox/multi-select-controlled.tsx b/aksel.nav.no/website/pages/eksempler/combobox/multi-select-controlled.tsx
index 79bd1d5e968..ba07845a92d 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/multi-select-controlled.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/multi-select-controlled.tsx
@@ -70,6 +70,11 @@ const initialSelectedOptions = ["Norge"];
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 1,
   desc: "Du kan overstyre blant annet value, selectedOptions, filteredOptions.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/multi-select-with-new-options.tsx b/aksel.nav.no/website/pages/eksempler/combobox/multi-select-with-new-options.tsx
index 7b10bb270d2..57c0239710d 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/multi-select-with-new-options.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/multi-select-with-new-options.tsx
@@ -32,6 +32,11 @@ const initialOptions = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 1,
   desc: "Ved Multi Select kan brukeren velge flere valg fra nedtrekkslisten.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/multi-select.tsx b/aksel.nav.no/website/pages/eksempler/combobox/multi-select.tsx
index 13ccb141e28..c70cb1a5e5e 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/multi-select.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/multi-select.tsx
@@ -31,6 +31,11 @@ const initialOptions = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 1,
   desc: "Ved Multi Select kan brukeren velge flere valg fra listen.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/single-select-with-autocomplete.tsx b/aksel.nav.no/website/pages/eksempler/combobox/single-select-with-autocomplete.tsx
index 5f42dbb2758..82742e2a4d8 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/single-select-with-autocomplete.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/single-select-with-autocomplete.tsx
@@ -30,6 +30,11 @@ const initialOptions = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 0,
   desc: "Ved Single Select velger brukeren ett valg fra listen. Med autocomplete foreslås et valg fra listen som matcher det brukeren skriver.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/single-select.tsx b/aksel.nav.no/website/pages/eksempler/combobox/single-select.tsx
index 7c2ab34b074..d61d425a528 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/single-select.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/single-select.tsx
@@ -30,6 +30,11 @@ const initialOptions = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 0,
   desc: "Ved Single Select velger brukeren kun ett valg fra nedtrekkslisten.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/with-error.tsx b/aksel.nav.no/website/pages/eksempler/combobox/with-error.tsx
index 0ef4f53f1d9..bea6ad7f626 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/with-error.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/with-error.tsx
@@ -31,6 +31,11 @@ const initialOptions = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 0,
   desc: "Ved Single Select velger brukeren kun ett valg fra nedtrekkslisten.",
diff --git a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
index 3f2949efbd6..cba0ba210ed 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
@@ -1,6 +1,6 @@
+import { useState } from "react";
 import { UNSAFE_Combobox } from "@navikt/ds-react";
 import { withDsExample } from "@/web/examples/withDsExample";
-import { useState } from "react";
 
 const Example = () => {
   const [selectedOptions, setSelectedOptions] = useState([
@@ -43,6 +43,11 @@ const options = [
 // EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE
 export default withDsExample(Example, { variant: "static" });
 
+/* Storybook story */
+export const Demo = {
+  render: Example,
+};
+
 export const args = {
   index: 1,
   desc: "Ved å sette en grense for maks antall valgte vil brukeren få opp en beskjed om at hen ikke kan velge flere når grensen er nådd. Resterende valg vil også bli inaktive.",

From e6a52e7c05e2d388feea9202e0dbc7b51bc7c4f7 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:37:54 +0100
Subject: [PATCH 56/68] Fjern ubrukt klasse som er i konflikt med
 navds-combobox__wrapper

---
 @navikt/core/css/form/combobox.css                       | 5 -----
 @navikt/core/react/src/form/combobox/ComboboxWrapper.tsx | 1 -
 2 files changed, 6 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index ed0647c448e..a75394fb344 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -1,8 +1,3 @@
-.navds-combobox-wrapper {
-  display: flex;
-  flex-direction: column;
-}
-
 .navds-combobox__wrapper {
   display: flex;
   flex-direction: column;
diff --git a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
index 1458824fdb9..f7853cf142f 100644
--- a/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
+++ b/@navikt/core/react/src/form/combobox/ComboboxWrapper.tsx
@@ -47,7 +47,6 @@ const ComboboxWrapper = ({
       ref={wrapperRef}
       className={cl(
         className,
-        "navds-combobox-wrapper",
         "navds-form-field",
         `navds-form-field--${inputSize}`,
         {

From 0f02ed3059cf54abdd78e8f0bc841bc2026d7a20 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:38:30 +0100
Subject: [PATCH 57/68] Trengs ikke etter at max selected ble flyttet ut av
 listen

---
 @navikt/core/css/form/combobox.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index a75394fb344..2927833de63 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -276,10 +276,6 @@
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }
 
-.navds-combobox__list-item--max-selected + li {
-  margin-top: 0;
-}
-
 .navds-combobox__list-item--no-options:hover,
 .navds-combobox__list-item--loading:hover,
 .navds-combobox__list-item--max-selected:hover {

From c14259147eb4cd218b46b50b0536e4d073959e9b Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:40:01 +0100
Subject: [PATCH 58/68] =?UTF-8?q?Denne=20koden=20gj=C3=B8r=20ingenting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 @navikt/core/css/form/combobox.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 2927833de63..37595739aa5 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -242,10 +242,6 @@
   left: 0;
   right: 0;
   z-index: 1;
-  gap: inherit;
-  background-color: inherit;
-  display: inherit;
-  flex-direction: inherit;
 }
 
 .navds-combobox__list-item {

From f417377249bd1de65fa02ca95f980c622d8bd0e1 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:41:17 +0100
Subject: [PATCH 59/68] Trenger ikke bruke :not, fordi vi tok vekk
 data-no-focus i en commit tidligere i dag

---
 @navikt/core/css/form/combobox.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 37595739aa5..9629e2db4ca 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -306,11 +306,7 @@
   padding-left: calc(var(--a-spacing-2) - 4px);
 }
 
-.navds-combobox__list-item:not(
-    .navds-combobox__list-item--max-selected,
-    .navds-combobox__list-item--loading,
-    .navds-combobox__list-item--no-options
-  )[data-no-focus="true"] {
+.navds-combobox__list-item[data-no-focus="true"] {
   cursor: not-allowed;
   opacity: 0.4;
 }

From b892e9aa9112a756dab01f60039a9927680abfd2 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:42:04 +0100
Subject: [PATCH 60/68] =?UTF-8?q?Bruk=20dynamiske=20selectedOptions=20for?=
 =?UTF-8?q?=20=C3=A5=20kunne=20endre=20de?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/eksempler/combobox/with-max-selected-limit.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
index cba0ba210ed..a4859dc03d7 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
@@ -14,7 +14,7 @@ const Example = () => {
         options={options}
         isMultiSelect
         maxSelected={{ limit: 3 }}
-        selectedOptions={["car", "bus", "train"]}
+        selectedOptions={selectedOptions}
         onToggleSelected={(option, isSelected) =>
           isSelected
             ? setSelectedOptions([...selectedOptions, option])

From 682c6666773782dfb36493710107f8aec682c59e Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:53:51 +0100
Subject: [PATCH 61/68] Update @navikt/core/css/form/combobox.css

Co-authored-by: Ken <26967723+KenAJoh@users.noreply.github.com>
---
 @navikt/core/css/form/combobox.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 9629e2db4ca..89f97ff5e1d 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -267,7 +267,8 @@
 
 .navds-combobox__list-item--max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
-  border-radius: 3px 3px 0 0; /* TODO: Change to default 4px border-radius when we refactor styling of dropdown */
+border-start-start-radius: calc(var(--a-border-radius-medium) - 1px);
+border-start-end-radius: calc(var(--a-border-radius-medium) - 1px);
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }

From 21b1515f0aaef0ecf5a7a3b7541690b586a981ab Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:57:01 +0100
Subject: [PATCH 62/68] Update
 @navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx

Co-authored-by: Ken <26967723+KenAJoh@users.noreply.github.com>
---
 .../src/form/combobox/FilteredOptions/FilteredOptions.tsx    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index f77b40710aa..dd8f15d2a88 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -143,8 +143,9 @@ const FilteredOptions = () => {
                 return;
               }
               toggleOption(option, event);
-              if (!isMultiSelect && !selectedOptions.includes(option))
-                toggleIsListOpen(false);
+              if (!isMultiSelect && !selectedOptions.includes(option)){
+                              toggleIsListOpen(false);
+              }
             }}
             role="option"
             aria-selected={selectedOptions.includes(option)}

From aae48a9dc659a5abb1082eec52321b10a18ed962 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:57:21 +0100
Subject: [PATCH 63/68] Update
 aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx

Co-authored-by: Halvor Haugan <83693529+HalvorHaugan@users.noreply.github.com>
---
 .../pages/eksempler/combobox/with-max-selected-limit.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
index a4859dc03d7..b451e10ae11 100644
--- a/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
+++ b/aksel.nav.no/website/pages/eksempler/combobox/with-max-selected-limit.tsx
@@ -10,7 +10,7 @@ const Example = () => {
   return (
     <div>
       <UNSAFE_Combobox
-        label="Hva er de kuleste transportmidlene? (velg opp til 3)"
+        label="Hva er de kuleste transportmidlene? (velg opptil 3)"
         options={options}
         isMultiSelect
         maxSelected={{ limit: 3 }}

From 9a822dd08d61c0f3684e1a5a1e958a0272202d2d Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Thu, 25 Jan 2024 14:58:07 +0100
Subject: [PATCH 64/68] Update @navikt/core/css/form/combobox.css

---
 @navikt/core/css/form/combobox.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 89f97ff5e1d..2a2e42db521 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -273,9 +273,7 @@ border-start-end-radius: calc(var(--a-border-radius-medium) - 1px);
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }
 
-.navds-combobox__list-item--no-options:hover,
-.navds-combobox__list-item--loading:hover,
-.navds-combobox__list-item--max-selected:hover {
+.navds-combobox__list_non-selectables:hover {
   cursor: default;
 }
 

From fd68bd687d3607100903230964c30d201c1d32fb Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 26 Jan 2024 12:00:57 +0100
Subject: [PATCH 65/68] Do not render an empty ul for FilteredOptions, as it
 add a gap at the bottom of the container

---
 .../FilteredOptions/FilteredOptions.tsx       | 175 +++++++++---------
 1 file changed, 91 insertions(+), 84 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index dd8f15d2a88..663b0cf1d06 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -33,6 +33,10 @@ const FilteredOptions = () => {
   const isDisabled = (option) =>
     maxSelected?.isLimitReached && !selectedOptions.includes(option);
 
+  const shouldRenderFilteredOptionsList =
+    (allowNewValues && isValueNew && !maxSelected?.isLimitReached) || // Render add new option
+    filteredOptions.length > 0; // Render filtered options
+
   return (
     <div
       className={cl("navds-combobox__list", {
@@ -70,92 +74,95 @@ const FilteredOptions = () => {
         )}
       </div>
 
-      <ul
-        ref={setFilteredOptionsRef}
-        role="listbox"
-        className="navds-combobox__list-options"
-      >
-        {isValueNew && !maxSelected?.isLimitReached && allowNewValues && (
-          <li
-            tabIndex={-1}
-            onMouseMove={() => {
-              if (
-                activeDecendantId !== filteredOptionsUtil.getAddNewOptionId(id)
-              ) {
-                virtualFocus.moveFocusToElement(
-                  filteredOptionsUtil.getAddNewOptionId(id),
-                );
-                setIsMouseLastUsedInputDevice(true);
-              }
-            }}
-            onPointerUp={(event) => {
-              toggleOption(value, event);
-              if (!isMultiSelect && !selectedOptions.includes(value))
-                toggleIsListOpen(false);
-            }}
-            id={filteredOptionsUtil.getAddNewOptionId(id)}
-            className={cl(
-              "navds-combobox__list-item navds-combobox__list-item--new-option",
-              {
-                "navds-combobox__list-item--new-option--focus":
+      {shouldRenderFilteredOptionsList && (
+        <ul
+          ref={setFilteredOptionsRef}
+          role="listbox"
+          className="navds-combobox__list-options"
+        >
+          {isValueNew && !maxSelected?.isLimitReached && allowNewValues && (
+            <li
+              tabIndex={-1}
+              onMouseMove={() => {
+                if (
+                  activeDecendantId !==
+                  filteredOptionsUtil.getAddNewOptionId(id)
+                ) {
+                  virtualFocus.moveFocusToElement(
+                    filteredOptionsUtil.getAddNewOptionId(id),
+                  );
+                  setIsMouseLastUsedInputDevice(true);
+                }
+              }}
+              onPointerUp={(event) => {
+                toggleOption(value, event);
+                if (!isMultiSelect && !selectedOptions.includes(value))
+                  toggleIsListOpen(false);
+              }}
+              id={filteredOptionsUtil.getAddNewOptionId(id)}
+              className={cl(
+                "navds-combobox__list-item navds-combobox__list-item--new-option",
+                {
+                  "navds-combobox__list-item--new-option--focus":
+                    activeDecendantId ===
+                    filteredOptionsUtil.getAddNewOptionId(id),
+                },
+              )}
+              role="option"
+              aria-selected={false}
+            >
+              <PlusIcon aria-hidden />
+              <BodyShort size={size}>
+                Legg til{" "}
+                <Label as="span" size={size}>
+                  &#8220;{value}&#8221;
+                </Label>
+              </BodyShort>
+            </li>
+          )}
+          {filteredOptions.map((option) => (
+            <li
+              className={cl("navds-combobox__list-item", {
+                "navds-combobox__list-item--focus":
                   activeDecendantId ===
-                  filteredOptionsUtil.getAddNewOptionId(id),
-              },
-            )}
-            role="option"
-            aria-selected={false}
-          >
-            <PlusIcon aria-hidden />
-            <BodyShort size={size}>
-              Legg til{" "}
-              <Label as="span" size={size}>
-                &#8220;{value}&#8221;
-              </Label>
-            </BodyShort>
-          </li>
-        )}
-        {filteredOptions.map((option) => (
-          <li
-            className={cl("navds-combobox__list-item", {
-              "navds-combobox__list-item--focus":
-                activeDecendantId ===
-                filteredOptionsUtil.getOptionId(id, option),
-              "navds-combobox__list-item--selected":
-                selectedOptions.includes(option),
-            })}
-            data-no-focus={isDisabled(option) || undefined}
-            id={filteredOptionsUtil.getOptionId(id, option)}
-            key={option}
-            tabIndex={-1}
-            onMouseMove={() => {
-              if (
-                activeDecendantId !==
-                filteredOptionsUtil.getOptionId(id, option)
-              ) {
-                virtualFocus.moveFocusToElement(
                   filteredOptionsUtil.getOptionId(id, option),
-                );
-                setIsMouseLastUsedInputDevice(true);
-              }
-            }}
-            onPointerUp={(event) => {
-              if (isDisabled(option)) {
-                return;
-              }
-              toggleOption(option, event);
-              if (!isMultiSelect && !selectedOptions.includes(option)){
-                              toggleIsListOpen(false);
-              }
-            }}
-            role="option"
-            aria-selected={selectedOptions.includes(option)}
-            aria-disabled={isDisabled(option) || undefined}
-          >
-            <BodyShort size={size}>{option}</BodyShort>
-            {selectedOptions.includes(option) && <CheckmarkIcon />}
-          </li>
-        ))}
-      </ul>
+                "navds-combobox__list-item--selected":
+                  selectedOptions.includes(option),
+              })}
+              data-no-focus={isDisabled(option) || undefined}
+              id={filteredOptionsUtil.getOptionId(id, option)}
+              key={option}
+              tabIndex={-1}
+              onMouseMove={() => {
+                if (
+                  activeDecendantId !==
+                  filteredOptionsUtil.getOptionId(id, option)
+                ) {
+                  virtualFocus.moveFocusToElement(
+                    filteredOptionsUtil.getOptionId(id, option),
+                  );
+                  setIsMouseLastUsedInputDevice(true);
+                }
+              }}
+              onPointerUp={(event) => {
+                if (isDisabled(option)) {
+                  return;
+                }
+                toggleOption(option, event);
+                if (!isMultiSelect && !selectedOptions.includes(option)) {
+                  toggleIsListOpen(false);
+                }
+              }}
+              role="option"
+              aria-selected={selectedOptions.includes(option)}
+              aria-disabled={isDisabled(option) || undefined}
+            >
+              <BodyShort size={size}>{option}</BodyShort>
+              {selectedOptions.includes(option) && <CheckmarkIcon />}
+            </li>
+          ))}
+        </ul>
+      )}
     </div>
   );
 };

From 1aa21d0ce36d17a4a0cf2b3c0eaf865716b50ee0 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 26 Jan 2024 12:14:45 +0100
Subject: [PATCH 66/68] Do not render an empty non-selectables container, as it
 adds a gap at the top of the container

---
 .../FilteredOptions/FilteredOptions.tsx       | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 663b0cf1d06..7b37615e766 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -33,6 +33,11 @@ const FilteredOptions = () => {
   const isDisabled = (option) =>
     maxSelected?.isLimitReached && !selectedOptions.includes(option);
 
+  const shouldRenderNonSelectables =
+    maxSelected?.isLimitReached || // Render maxSelected message
+    isLoading || // Render loading message
+    (!isLoading && filteredOptions.length === 0); // Render no hits message
+
   const shouldRenderFilteredOptionsList =
     (allowNewValues && isValueNew && !maxSelected?.isLimitReached) || // Render add new option
     filteredOptions.length > 0; // Render filtered options
@@ -46,33 +51,35 @@ const FilteredOptions = () => {
       id={filteredOptionsUtil.getFilteredOptionsId(id)}
       tabIndex={-1}
     >
-      <div className="navds-combobox__list_non-selectables" role="status">
-        {maxSelected?.isLimitReached && (
-          <div
-            className="navds-combobox__list-item navds-combobox__list-item--max-selected"
-            id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
-          >
-            {maxSelected.message ??
-              `${selectedOptions.length} av ${maxSelected.limit} er valgt.`}
-          </div>
-        )}
-        {isLoading && (
-          <div
-            className="navds-combobox__list-item navds-combobox__list-item--loading"
-            id={filteredOptionsUtil.getIsLoadingId(id)}
-          >
-            <Loader title="Søker..." />
-          </div>
-        )}
-        {!isLoading && filteredOptions.length === 0 && (
-          <div
-            className="navds-combobox__list-item navds-combobox__list-item--no-options"
-            id={filteredOptionsUtil.getNoHitsId(id)}
-          >
-            Ingen søketreff
-          </div>
-        )}
-      </div>
+      {shouldRenderNonSelectables && (
+        <div className="navds-combobox__list_non-selectables" role="status">
+          {maxSelected?.isLimitReached && (
+            <div
+              className="navds-combobox__list-item navds-combobox__list-item--max-selected"
+              id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
+            >
+              {maxSelected.message ??
+                `${selectedOptions.length} av ${maxSelected.limit} er valgt.`}
+            </div>
+          )}
+          {isLoading && (
+            <div
+              className="navds-combobox__list-item navds-combobox__list-item--loading"
+              id={filteredOptionsUtil.getIsLoadingId(id)}
+            >
+              <Loader title="Søker..." />
+            </div>
+          )}
+          {!isLoading && filteredOptions.length === 0 && (
+            <div
+              className="navds-combobox__list-item navds-combobox__list-item--no-options"
+              id={filteredOptionsUtil.getNoHitsId(id)}
+            >
+              Ingen søketreff
+            </div>
+          )}
+        </div>
+      )}
 
       {shouldRenderFilteredOptionsList && (
         <ul

From 71fbdcc5ead13176004c2949d424fd5271df9846 Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 26 Jan 2024 12:57:03 +0100
Subject: [PATCH 67/68] Non-selectables should not have
 navds-combobox__list-item class, as it introduces a few issues with hovering,
 etc.

---
 @navikt/core/css/form/combobox.css                 | 14 ++++++++++----
 .../combobox/FilteredOptions/FilteredOptions.tsx   |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 2a2e42db521..9fc9bf9d6f2 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -244,7 +244,11 @@
   z-index: 1;
 }
 
-.navds-combobox__list-item {
+.navds-combobox__list-item,
+.navds-combobox__list-item--loading,
+.navds-combobox__list-item--no-options,
+.navds-combobox__list-item--new-option,
+.navds-combobox--error.navds-combobox__list-item--max-selected {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -255,8 +259,10 @@
 }
 
 .navds-form-field--small .navds-combobox__list-item,
+.navds-form-field--small .navds-combobox__list-item--loading,
 .navds-form-field--small .navds-combobox__list-item--no-options,
-.navds-form-field--small .navds-combobox__list-item--new-option {
+.navds-form-field--small .navds-combobox__list-item--new-option,
+.navds-form-field--small .navds-combobox--error.navds-combobox__list-item--max-selected {
   padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
 }
 
@@ -267,8 +273,8 @@
 
 .navds-combobox__list-item--max-selected {
   background: var(--ac-combobox-list-item-max-selected-bg, var(--a-surface-info-subtle));
-border-start-start-radius: calc(var(--a-border-radius-medium) - 1px);
-border-start-end-radius: calc(var(--a-border-radius-medium) - 1px);
+  border-start-start-radius: calc(var(--a-border-radius-medium) - 1px);
+  border-start-end-radius: calc(var(--a-border-radius-medium) - 1px);
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
   margin-bottom: calc(var(--a-spacing-1) * -1);
 }
diff --git a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
index 7b37615e766..f5539b1fb6d 100644
--- a/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
+++ b/@navikt/core/react/src/form/combobox/FilteredOptions/FilteredOptions.tsx
@@ -55,7 +55,7 @@ const FilteredOptions = () => {
         <div className="navds-combobox__list_non-selectables" role="status">
           {maxSelected?.isLimitReached && (
             <div
-              className="navds-combobox__list-item navds-combobox__list-item--max-selected"
+              className="navds-combobox__list-item--max-selected"
               id={filteredOptionsUtil.getMaxSelectedOptionsId(id)}
             >
               {maxSelected.message ??
@@ -64,7 +64,7 @@ const FilteredOptions = () => {
           )}
           {isLoading && (
             <div
-              className="navds-combobox__list-item navds-combobox__list-item--loading"
+              className="navds-combobox__list-item--loading"
               id={filteredOptionsUtil.getIsLoadingId(id)}
             >
               <Loader title="Søker..." />
@@ -72,7 +72,7 @@ const FilteredOptions = () => {
           )}
           {!isLoading && filteredOptions.length === 0 && (
             <div
-              className="navds-combobox__list-item navds-combobox__list-item--no-options"
+              className="navds-combobox__list-item--no-options"
               id={filteredOptionsUtil.getNoHitsId(id)}
             >
               Ingen søketreff

From 7da5e0578492013da6350e17714d46e0c3fcaead Mon Sep 17 00:00:00 2001
From: Vegard Haugstvedt <it.vegard@gmail.com>
Date: Fri, 26 Jan 2024 13:07:51 +0100
Subject: [PATCH 68/68] Copy-pasted in an extra class that broke styling for
 max selected

---
 @navikt/core/css/form/combobox.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/@navikt/core/css/form/combobox.css b/@navikt/core/css/form/combobox.css
index 9fc9bf9d6f2..688dc788561 100644
--- a/@navikt/core/css/form/combobox.css
+++ b/@navikt/core/css/form/combobox.css
@@ -248,7 +248,7 @@
 .navds-combobox__list-item--loading,
 .navds-combobox__list-item--no-options,
 .navds-combobox__list-item--new-option,
-.navds-combobox--error.navds-combobox__list-item--max-selected {
+.navds-combobox__list-item--max-selected {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -262,7 +262,7 @@
 .navds-form-field--small .navds-combobox__list-item--loading,
 .navds-form-field--small .navds-combobox__list-item--no-options,
 .navds-form-field--small .navds-combobox__list-item--new-option,
-.navds-form-field--small .navds-combobox--error.navds-combobox__list-item--max-selected {
+.navds-form-field--small .navds-combobox__list-item--max-selected {
   padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
 }