Skip to content

Commit 076f752

Browse files
committed
chore: fix merge conflicts
2 parents 189531b + 07da6b1 commit 076f752

File tree

7 files changed

+628
-734
lines changed

7 files changed

+628
-734
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: ghiscoding
2+
ko_fi: ghiscoding

.github/workflows/publish-test-results.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Download and Extract Artifacts
27-
uses: dawidd6/action-download-artifact@v6
27+
uses: dawidd6/action-download-artifact@v8
2828
with:
2929
run_id: ${{ github.event.workflow_run.id }}
3030
path: artifacts

README.md

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To get started take a look at the [Live demo](https://ghiscoding.github.io/multi
1818

1919
## Demo
2020
Take a look at the [**Live demo**](https://ghiscoding.github.io/multiple-select-vanilla/) to see all available options/methods (there's a lot).
21-
You can also take a look at the "[Used by](#used-by)" section below to visit real world Open Source projects taking advantage of this library.
21+
You can also take a look at the "[Used by](#used-by)" section below to see and try live real world Open Source projects taking advantage of this library.
2222

2323
### Fully tested with [![Playwright](https://img.shields.io/badge/tested%20with-Playwright-45ba4b.svg?logo=playwright)](https://playwright.dev/)
2424

@@ -45,12 +45,13 @@ npm install multiple-select-vanilla
4545
Changes and new options:
4646
- dropped jQuery requirement and rewrote with browser native code.
4747
- rewritten in TypeScript to also provide typings support (`d.ts`)
48-
- make the lib CSP compliant (see CSP section below)
49-
- revamped the UI to give it a more Modern Look:
48+
- make the lib CSP compliant (see [CSP Compliance](#csp-compliance) section below)
49+
- add E2E tests, with Playwright, for all existing examples (over 65 of them)
50+
- revamped the UI in v3.x to give it a more Modern Look:
5051
- improved CSS styling by using SVG icons (CSS/SASS variables are also availables)
5152
- new Dark Mode
5253
- replace tabIndex with a more intuitive navigation & highlight by using arrow keys (or mouse hover)
53-
- show 3 different states on multiple selections (none " ", partial "-", all "🗸")
54+
- show 3 different states on multiple selections (none " ", partial "-" or all "🗸")
5455
- add extra options:
5556
- `autoAdjustDropHeight` will automatically adjust the drop (up/down) height by available space (see [demo](https://ghiscoding.github.io/multiple-select-vanilla/#/options30))
5657
- `autoAdjustDropPosition` will find best position (top/bottom) by its available space (see [demo](https://ghiscoding.github.io/multiple-select-vanilla/#/options29))
@@ -164,8 +165,23 @@ Before submitting a PR (pull request), please make sure that you followed the st
164165
## Sponsors
165166

166167
<div>
167-
<img class="circle avatar-user" src="https://avatars.githubusercontent.com/u/48218815?s=52&amp;v=4" width="40" height="40" alt="@kevinburkett" />
168-
<a href="/kevinburkett" class="Link">
169-
<span class="wb-break-word ml-2">kevinburkett</span>
170-
</a>
168+
<span>
169+
<a href="https://github.com/wundergraph" class="Link" title="Wundergraph" target="_blank"><img src="https://avatars.githubusercontent.com/u/64281914" width="50" height="50" valign="middle" /></a>
170+
</span>
171+
&nbsp;
172+
<span>
173+
<a href="https://github.com/johnsoncodehk" class="Link" title="johnsoncodehk (Volar)" target="_blank"><img src="https://avatars.githubusercontent.com/u/16279759" width="50" height="50" valign="middle" /></a>
174+
</span>
175+
&nbsp;
176+
<span>
177+
<a href="https://github.com/kevinburkett" class="Link" title="kevinburkett" target="_blank"><img class="circle avatar-user" src="https://avatars.githubusercontent.com/u/48218815?s=52&amp;v=4" width="45" height="45" valign="middle" /></a>
178+
</span>
179+
&nbsp;
180+
<span>
181+
<a href="https://github.com/anton-gustafsson" class="Link" title="anton-gustafsson" target="_blank"><img src="https://avatars.githubusercontent.com/u/22906905?s=52&v=4" width="50" height="50" valign="middle" /></a>
182+
</span>
183+
&nbsp;
184+
<span>
185+
<a href="https://github.com/gibson552" class="Link" title="gibson552" target="_blank"><img src="https://avatars.githubusercontent.com/u/84058359?s=52&v=4" width="50" height="50" valign="middle" /></a>
186+
</span>
171187
</div>

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959
},
6060
"devDependencies": {
6161
"@biomejs/biome": "^1.9.4",
62-
"@lerna-lite/cli": "^3.10.0",
63-
"@lerna-lite/publish": "^3.10.0",
64-
"@lerna-lite/watch": "^3.10.0",
65-
"@playwright/test": "^1.48.2",
66-
"@types/node": "^22.8.1",
62+
"@lerna-lite/cli": "^3.11.0",
63+
"@lerna-lite/publish": "^3.11.0",
64+
"@lerna-lite/watch": "^3.11.0",
65+
"@playwright/test": "^1.49.1",
66+
"@types/node": "^22.10.6",
6767
"conventional-changelog-conventionalcommits": "^7.0.2",
6868
"cross-env": "^7.0.3",
69-
"npm-run-all2": "^7.0.1",
70-
"pnpm": "^9.12.2",
69+
"npm-run-all2": "^7.0.2",
70+
"pnpm": "^9.15.4",
7171
"rimraf": "^5.0.10",
72-
"typescript": "5.6.3"
72+
"typescript": "5.7.3"
7373
},
74-
"packageManager": "pnpm@9.12.2"
74+
"packageManager": "pnpm@9.15.4"
7575
}

packages/demo/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"dependencies": {
2222
"@popperjs/core": "^2.11.8",
2323
"bootstrap": "^5.3.3",
24-
"dompurify": "^3.2.0",
24+
"dompurify": "^3.2.3",
2525
"font-awesome": "^4.7.0",
2626
"multiple-select-vanilla": "workspace:*"
2727
},
2828
"devDependencies": {
29-
"sass": "^1.80.4",
30-
"typescript": "5.6.3",
31-
"vite": "^6.0.0"
29+
"sass": "^1.83.4",
30+
"typescript": "5.7.3",
31+
"vite": "^6.0.7"
3232
}
3333
}

packages/multiple-select-vanilla/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
"autoprefixer": "^10.4.20",
8080
"cross-env": "^7.0.3",
8181
"cssnano": "^7.0.6",
82-
"esbuild": "^0.24.0",
82+
"esbuild": "^0.24.2",
8383
"native-copyfiles": "^0.2.1",
84-
"postcss": "^8.4.47",
84+
"postcss": "^8.5.1",
8585
"postcss-cli": "^11.0.0",
86-
"sass": "^1.80.4",
86+
"sass": "^1.83.4",
8787
"tinyglobby": "^0.2.10",
88-
"typescript": "5.6.3"
88+
"typescript": "5.7.3"
8989
}
9090
}

0 commit comments

Comments
 (0)