Skip to content

Commit

Permalink
Merge branch 'main' into eng-528-add-resource-list-section-component
Browse files Browse the repository at this point in the history
* main:
  Version Packages (#879)
  feat(icons): add dart icon fonts
  feat(icons): add "key" icon
  • Loading branch information
matvlaovi-flip committed Nov 29, 2024
2 parents 3a1b8e0 + 5891de2 commit 122596f
Show file tree
Hide file tree
Showing 22 changed files with 331 additions and 117 deletions.
10 changes: 10 additions & 0 deletions apps/swirl-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# swirl-docs

## 0.1.474

### Patch Changes

- Updated dependencies
[[`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)]:
- @getflip/swirl-components@0.263.0
- @getflip/swirl-icons@0.47.0
- @getflip/swirl-components-react@0.263.0

## 0.1.473

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions apps/swirl-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "swirl-docs",
"version": "0.1.473",
"version": "0.1.474",
"author": "Flip GmbH",
"description": "Swirl documentation",
"licence": "SEE LICENCE IN LICENSE.md",
Expand All @@ -28,9 +28,9 @@
"@algolia/autocomplete-theme-classic": "^1.7.4",
"@floating-ui/dom": "^1.1.0",
"@floating-ui/react": "^0.18.0",
"@getflip/swirl-components": "^0.262.0",
"@getflip/swirl-components-react": "^0.262.0",
"@getflip/swirl-icons": "^0.46.0",
"@getflip/swirl-components": "^0.263.0",
"@getflip/swirl-components-react": "^0.263.0",
"@getflip/swirl-icons": "^0.47.0",
"@getflip/swirl-tokens": "^2.7.0",
"@mdx-js/loader": "^2.1.3",
"@next/mdx": "^12.2.5",
Expand Down
8 changes: 8 additions & 0 deletions packages/bridge/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @getflip/bridge

## 0.6.38

### Patch Changes

- Updated dependencies
[[`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)]:
- @getflip/swirl-components@0.263.0

## 0.6.37

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@getflip/bridge",
"version": "0.6.37",
"version": "0.6.38",
"description": "Flip JavaScript Bridge for external integrations.",
"main": "dist/index.cjs.js",
"module": "dist/index.mjs",
Expand All @@ -18,7 +18,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@getflip/swirl-components": "^0.262.0",
"@getflip/swirl-components": "^0.263.0",
"uuid": "^9.0.0"
},
"devDependencies": {
Expand Down
13 changes: 13 additions & 0 deletions packages/swirl-components-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @getflip/swirl-components-angular

## 0.263.0

### Minor Changes

- [`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)
Thanks [@Sqrrl](https://github.com/Sqrrl)! - Add "key" icon

### Patch Changes

- Updated dependencies
[[`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)]:
- @getflip/swirl-components@0.263.0

## 0.262.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/swirl-components-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@getflip/swirl-components-angular",
"version": "0.262.0",
"version": "0.263.0",
"scripts": {
"ng": "ng",
"build": "ng build"
Expand All @@ -14,7 +14,7 @@
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/router": "^16.2.12",
"@getflip/swirl-components": "^0.262.0",
"@getflip/swirl-components": "^0.263.0",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "~0.13.3"
Expand Down
13 changes: 13 additions & 0 deletions packages/swirl-components-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @getflip/swirl-components-react

## 0.263.0

### Minor Changes

- [`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)
Thanks [@Sqrrl](https://github.com/Sqrrl)! - Add "key" icon

### Patch Changes

- Updated dependencies
[[`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)]:
- @getflip/[email protected]

## 0.262.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/swirl-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@getflip/swirl-components-react",
"version": "0.262.0",
"version": "0.263.0",
"type": "module",
"files": [
"dist"
Expand All @@ -18,7 +18,7 @@
"build": "tsc && vite build"
},
"dependencies": {
"@getflip/swirl-components": "^0.262.0",
"@getflip/swirl-components": "^0.263.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
13 changes: 13 additions & 0 deletions packages/swirl-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @getflip/swirl-components

## 0.263.0

### Minor Changes

- [`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)
Thanks [@Sqrrl](https://github.com/Sqrrl)! - Add "key" icon

### Patch Changes

- Updated dependencies
[[`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)]:
- @getflip/[email protected]

## 0.262.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/swirl-components/icons.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/swirl-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@getflip/swirl-components",
"version": "0.262.0",
"version": "0.263.0",
"description": "Swirl Design System Web Component Library",
"main": "dist/index.cjs.js",
"module": "dist/index.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@floating-ui/dom": "1.0.1",
"@getflip/swirl-icons": "^0.46.0",
"@getflip/swirl-icons": "^0.47.0",
"@getflip/swirl-tokens": "^2.7.0",
"@stencil/core": "^4.18.1",
"a11y-dialog": "^7.5.2",
Expand Down
17 changes: 17 additions & 0 deletions packages/swirl-components/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,10 @@ export namespace Components {
"color"?: SwirlIconColor1;
"size": SwirlIconSize;
}
interface SwirlIconKey {
"color"?: SwirlIconColor1;
"size": SwirlIconSize;
}
interface SwirlIconKeyboard {
"color"?: SwirlIconColor1;
"size": SwirlIconSize;
Expand Down Expand Up @@ -3687,6 +3691,12 @@ declare global {
prototype: HTMLSwirlIconInventoryElement;
new (): HTMLSwirlIconInventoryElement;
};
interface HTMLSwirlIconKeyElement extends Components.SwirlIconKey, HTMLStencilElement {
}
var HTMLSwirlIconKeyElement: {
prototype: HTMLSwirlIconKeyElement;
new (): HTMLSwirlIconKeyElement;
};
interface HTMLSwirlIconKeyboardElement extends Components.SwirlIconKeyboard, HTMLStencilElement {
}
var HTMLSwirlIconKeyboardElement: {
Expand Down Expand Up @@ -5542,6 +5552,7 @@ declare global {
"swirl-icon-insert-below": HTMLSwirlIconInsertBelowElement;
"swirl-icon-insert-on-top": HTMLSwirlIconInsertOnTopElement;
"swirl-icon-inventory": HTMLSwirlIconInventoryElement;
"swirl-icon-key": HTMLSwirlIconKeyElement;
"swirl-icon-keyboard": HTMLSwirlIconKeyboardElement;
"swirl-icon-keyboard-hide": HTMLSwirlIconKeyboardHideElement;
"swirl-icon-light-mode": HTMLSwirlIconLightModeElement;
Expand Down Expand Up @@ -6611,6 +6622,10 @@ declare namespace LocalJSX {
"color"?: SwirlIconColor1;
"size"?: SwirlIconSize;
}
interface SwirlIconKey {
"color"?: SwirlIconColor1;
"size"?: SwirlIconSize;
}
interface SwirlIconKeyboard {
"color"?: SwirlIconColor1;
"size"?: SwirlIconSize;
Expand Down Expand Up @@ -7980,6 +7995,7 @@ declare namespace LocalJSX {
"swirl-icon-insert-below": SwirlIconInsertBelow;
"swirl-icon-insert-on-top": SwirlIconInsertOnTop;
"swirl-icon-inventory": SwirlIconInventory;
"swirl-icon-key": SwirlIconKey;
"swirl-icon-keyboard": SwirlIconKeyboard;
"swirl-icon-keyboard-hide": SwirlIconKeyboardHide;
"swirl-icon-light-mode": SwirlIconLightMode;
Expand Down Expand Up @@ -8352,6 +8368,7 @@ declare module "@stencil/core" {
"swirl-icon-insert-below": LocalJSX.SwirlIconInsertBelow & JSXBase.HTMLAttributes<HTMLSwirlIconInsertBelowElement>;
"swirl-icon-insert-on-top": LocalJSX.SwirlIconInsertOnTop & JSXBase.HTMLAttributes<HTMLSwirlIconInsertOnTopElement>;
"swirl-icon-inventory": LocalJSX.SwirlIconInventory & JSXBase.HTMLAttributes<HTMLSwirlIconInventoryElement>;
"swirl-icon-key": LocalJSX.SwirlIconKey & JSXBase.HTMLAttributes<HTMLSwirlIconKeyElement>;
"swirl-icon-keyboard": LocalJSX.SwirlIconKeyboard & JSXBase.HTMLAttributes<HTMLSwirlIconKeyboardElement>;
"swirl-icon-keyboard-hide": LocalJSX.SwirlIconKeyboardHide & JSXBase.HTMLAttributes<HTMLSwirlIconKeyboardHideElement>;
"swirl-icon-light-mode": LocalJSX.SwirlIconLightMode & JSXBase.HTMLAttributes<HTMLSwirlIconLightModeElement>;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// DO NOT EDIT. THIS FILE GETS GENERATED VIA "yarn generate".

import { Component, Fragment, h, Prop } from "@stencil/core";
import { SwirlIconSize } from "../swirl-icon.types";
import { SwirlIconColor } from "../swirl-icon";
import classnames from "classnames";

@Component({
shadow: true,
styleUrl: "../swirl-icon.css",
tag: "swirl-icon-key",
})
export class SwirlIconKey {
@Prop() color?: SwirlIconColor;
@Prop() size: SwirlIconSize = 24;

render() {
const viewBoxSize = this.size === 20 ? 24 : this.size;

const styles = {
color: Boolean(this.color) ? `var(--s-icon-${this.color})` : undefined,
};

const className = classnames("swirl-icon", `swirl-icon--size-${this.size}`);

return (
<svg
aria-hidden="true"
class={className}
fill="none"
height={this.size}
part="icon"
style={styles}
viewBox={`0 0 ${viewBoxSize} ${viewBoxSize}`}
width={this.size}
xmlns="http://www.w3.org/2000/svg"
>
{this.size === 16 && (
<Fragment>
<path
d="M4.66669 9.33333C4.30002 9.33333 3.98613 9.20278 3.72502 8.94167C3.46391 8.68056 3.33335 8.36667 3.33335 8C3.33335 7.63333 3.46391 7.31944 3.72502 7.05833C3.98613 6.79722 4.30002 6.66667 4.66669 6.66667C5.03335 6.66667 5.34724 6.79722 5.60835 7.05833C5.86946 7.31944 6.00002 7.63333 6.00002 8C6.00002 8.36667 5.86946 8.68056 5.60835 8.94167C5.34724 9.20278 5.03335 9.33333 4.66669 9.33333ZM4.66669 12C3.55558 12 2.61113 11.6111 1.83335 10.8333C1.05558 10.0556 0.666687 9.11111 0.666687 8C0.666687 6.88889 1.05558 5.94444 1.83335 5.16667C2.61113 4.38889 3.55558 4 4.66669 4C5.41113 4 6.08613 4.18333 6.69169 4.55C7.29724 4.91667 7.7778 5.4 8.13335 6H13.7167C13.8056 6 13.8917 6.01667 13.975 6.05C14.0584 6.08333 14.1334 6.13333 14.2 6.2L15.5334 7.53333C15.6 7.6 15.6472 7.67222 15.675 7.75C15.7028 7.82778 15.7167 7.91111 15.7167 8C15.7167 8.08889 15.7028 8.17222 15.675 8.25C15.6472 8.32778 15.6 8.4 15.5334 8.46667L13.4167 10.5833C13.3611 10.6389 13.2945 10.6833 13.2167 10.7167C13.1389 10.75 13.0611 10.7722 12.9834 10.7833C12.9056 10.7944 12.8278 10.7889 12.75 10.7667C12.6722 10.7444 12.6 10.7056 12.5334 10.65L11.6667 10L10.7167 10.7167C10.6611 10.7611 10.6 10.7944 10.5334 10.8167C10.4667 10.8389 10.4 10.85 10.3334 10.85C10.2667 10.85 10.1972 10.8389 10.125 10.8167C10.0528 10.7944 9.98891 10.7611 9.93335 10.7167L8.91669 10H8.13335C7.7778 10.6 7.29724 11.0833 6.69169 11.45C6.08613 11.8167 5.41113 12 4.66669 12ZM4.66669 10.6667C5.28891 10.6667 5.83613 10.4778 6.30835 10.1C6.78058 9.72222 7.09447 9.24444 7.25002 8.66667H9.33335L10.3 9.35L11.6667 8.33333L12.85 9.25L14.1 8L13.4334 7.33333H7.25002C7.09447 6.75556 6.78058 6.27778 6.30835 5.9C5.83613 5.52222 5.28891 5.33333 4.66669 5.33333C3.93335 5.33333 3.30558 5.59444 2.78335 6.11667C2.26113 6.63889 2.00002 7.26667 2.00002 8C2.00002 8.73333 2.26113 9.36111 2.78335 9.88333C3.30558 10.4056 3.93335 10.6667 4.66669 10.6667Z"
fill="currentColor"
/>
</Fragment>
)}
{(this.size === 20 || this.size === 24) && (
<Fragment>
<path
d="M7 14C6.45 14 5.97917 13.8042 5.5875 13.4125C5.19583 13.0208 5 12.55 5 12C5 11.45 5.19583 10.9792 5.5875 10.5875C5.97917 10.1958 6.45 10 7 10C7.55 10 8.02083 10.1958 8.4125 10.5875C8.80417 10.9792 9 11.45 9 12C9 12.55 8.80417 13.0208 8.4125 13.4125C8.02083 13.8042 7.55 14 7 14ZM7 18C5.33333 18 3.91667 17.4167 2.75 16.25C1.58333 15.0833 1 13.6667 1 12C1 10.3333 1.58333 8.91667 2.75 7.75C3.91667 6.58333 5.33333 6 7 6C8.11667 6 9.12917 6.275 10.0375 6.825C10.9458 7.375 11.6667 8.1 12.2 9H20.575C20.7083 9 20.8375 9.025 20.9625 9.075C21.0875 9.125 21.2 9.2 21.3 9.3L23.3 11.3C23.4 11.4 23.4708 11.5083 23.5125 11.625C23.5542 11.7417 23.575 11.8667 23.575 12C23.575 12.1333 23.5542 12.2583 23.5125 12.375C23.4708 12.4917 23.4 12.6 23.3 12.7L20.125 15.875C20.0417 15.9583 19.9417 16.025 19.825 16.075C19.7083 16.125 19.5917 16.1583 19.475 16.175C19.3583 16.1917 19.2417 16.1833 19.125 16.15C19.0083 16.1167 18.9 16.0583 18.8 15.975L17.5 15L16.075 16.075C15.9917 16.1417 15.9 16.1917 15.8 16.225C15.7 16.2583 15.6 16.275 15.5 16.275C15.4 16.275 15.2958 16.2583 15.1875 16.225C15.0792 16.1917 14.9833 16.1417 14.9 16.075L13.375 15H12.2C11.6667 15.9 10.9458 16.625 10.0375 17.175C9.12917 17.725 8.11667 18 7 18ZM7 16C7.93333 16 8.75417 15.7167 9.4625 15.15C10.1708 14.5833 10.6417 13.8667 10.875 13H14L15.45 14.025L17.5 12.5L19.275 13.875L21.15 12L20.15 11H10.875C10.6417 10.1333 10.1708 9.41667 9.4625 8.85C8.75417 8.28333 7.93333 8 7 8C5.9 8 4.95833 8.39167 4.175 9.175C3.39167 9.95833 3 10.9 3 12C3 13.1 3.39167 14.0417 4.175 14.825C4.95833 15.6083 5.9 16 7 16Z"
fill="currentColor"
/>
</Fragment>
)}
{this.size === 28 && (
<Fragment>
<path
d="M8.16669 16.3333C7.52502 16.3333 6.97572 16.1049 6.51877 15.6479C6.06183 15.191 5.83335 14.6417 5.83335 14C5.83335 13.3583 6.06183 12.809 6.51877 12.3521C6.97572 11.8951 7.52502 11.6667 8.16669 11.6667C8.80835 11.6667 9.35766 11.8951 9.8146 12.3521C10.2715 12.809 10.5 13.3583 10.5 14C10.5 14.6417 10.2715 15.191 9.8146 15.6479C9.35766 16.1049 8.80835 16.3333 8.16669 16.3333ZM8.16669 21C6.22224 21 4.56947 20.3194 3.20835 18.9583C1.84724 17.5972 1.16669 15.9444 1.16669 14C1.16669 12.0556 1.84724 10.4028 3.20835 9.04167C4.56947 7.68056 6.22224 7 8.16669 7C9.46947 7 10.6507 7.32083 11.7104 7.9625C12.7702 8.60417 13.6111 9.45 14.2334 10.5H24.0042C24.1597 10.5 24.3104 10.5292 24.4563 10.5875C24.6021 10.6458 24.7334 10.7333 24.85 10.85L27.1834 13.1833C27.3 13.3 27.3827 13.4264 27.4313 13.5625C27.4799 13.6986 27.5042 13.8444 27.5042 14C27.5042 14.1556 27.4799 14.3014 27.4313 14.4375C27.3827 14.5736 27.3 14.7 27.1834 14.8167L23.4792 18.5208C23.382 18.6181 23.2653 18.6958 23.1292 18.7542C22.9931 18.8125 22.857 18.8514 22.7209 18.8708C22.5847 18.8903 22.4486 18.8806 22.3125 18.8417C22.1764 18.8028 22.05 18.7347 21.9334 18.6375L20.4167 17.5L18.7542 18.7542C18.657 18.8319 18.55 18.8903 18.4334 18.9292C18.3167 18.9681 18.2 18.9875 18.0834 18.9875C17.9667 18.9875 17.8452 18.9681 17.7188 18.9292C17.5924 18.8903 17.4806 18.8319 17.3834 18.7542L15.6042 17.5H14.2334C13.6111 18.55 12.7702 19.3958 11.7104 20.0375C10.6507 20.6792 9.46947 21 8.16669 21ZM8.16669 18.6667C9.25558 18.6667 10.2132 18.3361 11.0396 17.675C11.866 17.0139 12.4153 16.1778 12.6875 15.1667H16.3334L18.025 16.3625L20.4167 14.5833L22.4875 16.1875L24.675 14L23.5084 12.8333H12.6875C12.4153 11.8222 11.866 10.9861 11.0396 10.325C10.2132 9.66389 9.25558 9.33333 8.16669 9.33333C6.88335 9.33333 5.78474 9.79028 4.87085 10.7042C3.95696 11.6181 3.50002 12.7167 3.50002 14C3.50002 15.2833 3.95696 16.3819 4.87085 17.2958C5.78474 18.2097 6.88335 18.6667 8.16669 18.6667Z"
fill="currentColor"
/>
</Fragment>
)}
</svg>
);
}
}
58 changes: 58 additions & 0 deletions packages/swirl-components/vscode-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -7695,6 +7695,64 @@
}
]
},
{
"name": "swirl-icon-key",
"description": {
"kind": "markdown",
"value": ""
},
"attributes": [
{
"name": "color",
"description": "",
"values": [
{
"name": "critical"
},
{
"name": "default"
},
{
"name": "disabled"
},
{
"name": "highlight"
},
{
"name": "info"
},
{
"name": "on-action-primary"
},
{
"name": "on-image"
},
{
"name": "on-status"
},
{
"name": "on-surface-highlight"
},
{
"name": "on-surface-highlight-subdued"
},
{
"name": "strong"
},
{
"name": "success"
},
{
"name": "warning"
}
]
},
{
"name": "size",
"description": ""
}
]
},
{
"name": "swirl-icon-keyboard",
"description": {
Expand Down
7 changes: 7 additions & 0 deletions packages/swirl-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @getflip/swirl-icons

## 0.47.0

### Minor Changes

- [`2ca763ad`](https://github.com/getflip/swirl/commit/2ca763ad5ba6ba5190a370342fc857244fa8c772)
Thanks [@Sqrrl](https://github.com/Sqrrl)! - Add "key" icon

## 0.46.0

### Minor Changes
Expand Down
Binary file modified packages/swirl-icons/dart/lib/fonts/flip-legacy-icons.ttf
Binary file not shown.
Binary file modified packages/swirl-icons/dart/lib/fonts/swirl-icons.ttf
Binary file not shown.
Loading

0 comments on commit 122596f

Please sign in to comment.