Skip to content

Commit

Permalink
Merge pull request #222 from capitec/develop
Browse files Browse the repository at this point in the history
Next RC to main
  • Loading branch information
BOTLANNER authored Dec 11, 2023
2 parents 7dd2caf + ba0d0f5 commit 2520518
Show file tree
Hide file tree
Showing 75 changed files with 2,211 additions and 40 deletions.
7 changes: 5 additions & 2 deletions .tooling/scripts/eleventy-config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ export default async config => {
}
});

config.setBrowserSyncConfig({
config.setServerOptions({
module: "@11ty/eleventy-server-browsersync",

logLevel: 'info',
server: {
baseDir: process.env.ELEVENTY_BASE_PATH ? '.' : 'docs',
Expand All @@ -105,7 +107,8 @@ export default async config => {
}
},
startPath: process.env.ELEVENTY_BASE_PATH ? process.env.ELEVENTY_BASE_PATH : '/'
});

})

return {
dir: {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},
"[typescript]": {
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.organizeImports": false
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
Expand Down
2,224 changes: 2,191 additions & 33 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@capitec/omni-components",
"version": "0.9.4",
"version": "0.9.5",
"type": "module",
"description": "Modern UI component library for mobile and web",
"scripts": {
Expand Down Expand Up @@ -96,6 +96,7 @@
"homepage": "https://capitec.github.io/open-source/docs/omni-components/",
"devDependencies": {
"@11ty/eleventy": "^2.0.1",
"@11ty/eleventy-server-browsersync": "^1.0.2",
"@appnest/readme": "^1.2.7",
"@codemirror/lang-css": "^6.0.0",
"@codemirror/lang-html": "^6.1.3",
Expand Down
6 changes: 6 additions & 0 deletions src/select/Select.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export interface Args extends BaseArgs {
searchable: boolean;
loading_indicator: string;
filterItems: (filterValue: string, items: SelectTypes) => SelectItems;
arrow: string;
more: string;
}

const displayItems = [
Expand Down Expand Up @@ -85,6 +87,8 @@ export const Interactive: ComponentStoryFormat<Args> = {
?searchable="${args.searchable}"
empty-message="${args.emptyMessage}"
>${args.prefix ? html`${'\r\n'}${unsafeHTML(assignToSlot('prefix', args.prefix))}` : nothing}
${args.arrow ? html`${'\r\n'}${unsafeHTML(assignToSlot('arrow', args.arrow))}` : nothing}
${args.more ? html`${'\r\n'}${unsafeHTML(assignToSlot('more', args.more))}` : nothing}
${args.clear ? html`${'\r\n'}${unsafeHTML(assignToSlot('clear', args.clear))}` : nothing}${
args.suffix ? html`${'\r\n'}${unsafeHTML(assignToSlot('suffix', args.suffix))}` : nothing
}
Expand Down Expand Up @@ -154,6 +158,8 @@ export const Interactive: ComponentStoryFormat<Args> = {
prefix: '',
suffix: '',
clear: '',
arrow: '',
more: '',
items: displayItems as Record<string, unknown>[],
displayField: 'label',
idField: 'id',
Expand Down
7 changes: 5 additions & 2 deletions src/select/Select.ts
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,14 @@ export class Select extends OmniFormElement {
/* Only applies styles to transform the control icon if on Desktop */
@media screen and (min-width: 767px) {
.control.expanded {
.control.expanded .arrow,
.control.expanded ::slotted([slot='arrow']) {
transform: rotate(180deg);
transition: all linear 0.15s;
}
.control.collapsed {
.control.collapsed .arrow,
.control.collapsed ::slotted([slot='arrow']) {
transform: none;
transition: all linear 0.15s;
}
Expand Down Expand Up @@ -762,6 +764,7 @@ export class Select extends OmniFormElement {
// Render the control of the Select when clicked this will open up the items container
protected override renderControl() {
const controlIcon: ClassInfo = {
arrow: true, // Required for desktop slot rotation.
icon: true,
disabled: this.disabled,
error: this.error as string
Expand Down

0 comments on commit 2520518

Please sign in to comment.