mirror of
https://github.com/navikt/aksel.git
synced 2026-10-13 09:12:03 +00:00
Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30330473b1 | ||
|
|
b1e18fd724 | ||
|
|
5b458c2d52 | ||
|
|
6450922b32 | ||
|
|
f6e3840cde | ||
|
|
1afdee453f | ||
|
|
1c7734fb09 | ||
|
|
9816c4f3a9 | ||
|
|
c40bf79a46 | ||
|
|
b1cf8e4724 | ||
|
|
4578693878 | ||
|
|
297aef13ad | ||
|
|
d5c040d24f | ||
|
|
250d6c55b6 | ||
|
|
de69c6c18b | ||
|
|
657b7f3f3e | ||
|
|
00697c7581 | ||
|
|
a556ac6d44 | ||
|
|
32c7228504 | ||
|
|
ff001f2bcf | ||
|
|
048dc285eb | ||
|
|
ecd58dd7d3 | ||
|
|
2845342468 | ||
|
|
6682be1c8e | ||
|
|
dfe923582a | ||
|
|
d6e2705700 | ||
|
|
f0d9a8853f | ||
|
|
19a8c46378 |
No files matched your search
@@ -12,6 +12,7 @@
|
||||
"@navikt/ds-react-internal",
|
||||
"@navikt/ds-codemod",
|
||||
"@navikt/aksel-icons",
|
||||
"@navikt/aksel",
|
||||
"@navikt/ds-icons"
|
||||
]
|
||||
],
|
||||
|
||||
@@ -6,34 +6,6 @@ on:
|
||||
- next
|
||||
|
||||
jobs:
|
||||
snyk-monitor:
|
||||
name: monitor dependencies
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
- name: Run Snyk to check for vulnerabilities
|
||||
continue-on-error: true
|
||||
uses: snyk/actions/node@master
|
||||
env:
|
||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||
with:
|
||||
command: monitor
|
||||
args: --org=designsystemet --severity-threshold=high
|
||||
snyk-test:
|
||||
name: analyze dependencies
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
- name: Run Snyk to check for vulnerabilities
|
||||
uses: snyk/actions/node@master
|
||||
continue-on-error: true
|
||||
env:
|
||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||
with:
|
||||
command: test
|
||||
args: --org=designsystemet --severity-threshold=high
|
||||
build_and_deploy:
|
||||
name: Build and deploy to dev-gcp
|
||||
runs-on: ubuntu-20.04
|
||||
@@ -49,7 +21,6 @@ jobs:
|
||||
- name: add tokens to .env
|
||||
run: |
|
||||
echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
|
||||
echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env
|
||||
echo "USE_CDN_ASSETS=true" >> aksel.nav.no/website/.env
|
||||
|
||||
@@ -10,34 +10,6 @@ env:
|
||||
IMAGE: ghcr.io/navikt/aksel
|
||||
|
||||
jobs:
|
||||
snyk-monitor:
|
||||
name: monitor dependencies
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
- name: Run Snyk to check for vulnerabilities
|
||||
continue-on-error: true
|
||||
uses: snyk/actions/node@master
|
||||
env:
|
||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||
with:
|
||||
command: monitor
|
||||
args: --org=designsystemet --severity-threshold=high
|
||||
snyk-test:
|
||||
name: analyze dependencies
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
- name: Run Snyk to check for vulnerabilities
|
||||
uses: snyk/actions/node@master
|
||||
continue-on-error: true
|
||||
env:
|
||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||
with:
|
||||
command: test
|
||||
args: --org=designsystemet --severity-threshold=high
|
||||
sync_data_with_sanity:
|
||||
name: Update component data
|
||||
runs-on: ubuntu-latest
|
||||
@@ -84,7 +56,6 @@ jobs:
|
||||
- name: add tokens to .env
|
||||
run: |
|
||||
echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
|
||||
echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env
|
||||
echo "USE_CDN_ASSETS=true" >> aksel.nav.no/website/.env
|
||||
|
||||
@@ -23,7 +23,6 @@ jobs:
|
||||
- name: add tokens to .env
|
||||
run: |
|
||||
echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
|
||||
echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
|
||||
jobs:
|
||||
build:
|
||||
name: "Release packages"
|
||||
if: "!contains(github.event.head_commit.message, '[ci skip]')"
|
||||
if: ${{!contains(github.event.head_commit.message, '[ci skip]')}}
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
id-token: "write"
|
||||
@@ -45,6 +45,7 @@ jobs:
|
||||
with:
|
||||
version: yarn version
|
||||
publish: yarn release
|
||||
createGithubReleases: false
|
||||
env:
|
||||
NPM_TOKEN: ${{ secrets.NPM_AUTOMATION }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -82,3 +83,17 @@ jobs:
|
||||
cdn-team-name: aksel
|
||||
source: ./@navikt/aksel-icons/aksel-icons.zip
|
||||
destination: "/icons/zip"
|
||||
|
||||
- name: Get @navikt/ds-css version
|
||||
run: |
|
||||
VERSION=$(yarn css:get-version)
|
||||
echo "version=$VERSION" >> $GITHUB_ENV
|
||||
echo "Version of @navikt/ds-css: ${{ env.version }}"
|
||||
|
||||
- name: Upload CSS to NAV CDN
|
||||
if: steps.changesets.outputs.published == 'true'
|
||||
uses: navikt/frontend/actions/cdn-upload/v1@main
|
||||
with:
|
||||
cdn-team-name: aksel
|
||||
source: ./@navikt/core/css/dist/version/${{env.version}}
|
||||
destination: "@navikt/ds-css"
|
||||
@@ -23,7 +23,6 @@ jobs:
|
||||
- name: add tokens to .env
|
||||
run: |
|
||||
echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
|
||||
echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
|
||||
echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env
|
||||
|
||||
|
||||
@@ -1,5 +1,26 @@
|
||||
# @navikt/aksel-icons
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1928](https://github.com/navikt/aksel/pull/1928) [`dfe923582`](https://github.com/navikt/aksel/commit/dfe923582a57b41c77cfb4fbfa7c56be047ef2b0) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :tada: Lagt til nye ikoner :tada:
|
||||
|
||||
- HandKnot.svg
|
||||
- HandKnotFilled.svg
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -13,5 +13,5 @@ keywords:
|
||||
- forward
|
||||
- videresend
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 20.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -6,5 +6,5 @@ keywords:
|
||||
- venstre
|
||||
- side
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 20.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -10,5 +10,5 @@ keywords:
|
||||
- nettverk
|
||||
- network
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 18.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -9,5 +9,5 @@ keywords:
|
||||
- open
|
||||
- åpne
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 19.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -0,0 +1,3 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.75023 5C8.75023 4.30964 9.30988 3.75 10.0002 3.75C10.6906 3.75 11.2502 4.30964 11.2502 5V5.75H8.75023V5ZM8.75023 7.25V13.5C8.75023 13.7929 8.57973 14.059 8.31363 14.1814C8.04753 14.3038 7.73453 14.2601 7.51214 14.0694L5.39829 12.2576C4.91367 11.8422 4.19095 11.8699 3.73962 12.3213C3.30979 12.7511 3.26143 13.4316 3.62616 13.9179L8.37524 20.25H18.3986L19.6173 14.7659C19.8869 13.5528 19.122 12.3509 17.909 12.0813L11.8375 10.7321C11.4944 10.6559 11.2502 10.3515 11.2502 10V7.25H8.75023ZM10.0002 2.25C8.4921 2.25 7.26751 3.46401 7.25042 4.9681C7.03844 4.82515 6.81067 4.68453 6.58336 4.56753C6.28845 4.41573 5.89474 4.25 5.5 4.25C4.25736 4.25 3.25 5.25736 3.25 6.5C3.25 7.74264 4.25736 8.75 5.5 8.75C5.89474 8.75 6.28845 8.58427 6.58336 8.43247C6.8106 8.31551 7.03831 8.17493 7.25023 8.03203V11.8693L6.37448 11.1187C5.29475 10.1932 3.68453 10.255 2.67896 11.2606C1.72129 12.2183 1.61354 13.7344 2.42616 14.8179L7.40024 21.45C7.54188 21.6389 7.76417 21.75 8.00023 21.75H19.0002C19.3518 21.75 19.6561 21.5059 19.7324 21.1627L21.0816 15.0913C21.5309 13.0695 20.2561 11.0663 18.2344 10.6171L12.7502 9.39837V8.03234C12.962 8.17514 13.1896 8.31559 13.4166 8.43247C13.7115 8.58427 14.1053 8.75 14.5 8.75C15.7426 8.75 16.75 7.74264 16.75 6.5C16.75 5.25736 15.7426 4.25 14.5 4.25C14.1053 4.25 13.7115 4.41573 13.4166 4.56753C13.1895 4.68444 12.9619 4.82495 12.75 4.96779C12.7328 3.46385 11.5083 2.25 10.0002 2.25ZM13.3772 6.6411C13.3116 6.59389 13.2475 6.54657 13.1859 6.5C13.2475 6.45343 13.3116 6.40611 13.3772 6.3589C13.6227 6.18236 13.8759 6.0182 14.1031 5.90122C14.2162 5.84301 14.3119 5.80222 14.3886 5.77707C14.4608 5.75335 14.4956 5.7504 14.4997 5.75005C14.5002 5.75001 14.5003 5.75 14.5 5.75C14.9142 5.75 15.25 6.08579 15.25 6.5C15.25 6.91421 14.9142 7.25 14.5 7.25L14.5001 7.24999C14.5002 7.25 14.5002 7.25 14.5 7.25L14.4997 7.24995C14.4956 7.2496 14.4608 7.24665 14.3886 7.22293C14.3119 7.19778 14.2162 7.15699 14.1031 7.09878C13.8759 6.9818 13.6227 6.81764 13.3772 6.6411ZM6.81414 6.5C6.75246 6.45343 6.68842 6.40611 6.62277 6.3589C6.3773 6.18236 6.12414 6.0182 5.89688 5.90122C5.78379 5.84301 5.68809 5.80222 5.61143 5.77707C5.53915 5.75335 5.50443 5.7504 5.50025 5.75005C5.49978 5.75001 5.4997 5.75 5.5 5.75C5.08579 5.75 4.75 6.08579 4.75 6.5C4.75 6.91421 5.08579 7.25 5.5 7.25C5.4997 7.25 5.49978 7.24999 5.50025 7.24995C5.50443 7.2496 5.53915 7.24665 5.61143 7.22293C5.68809 7.19778 5.78379 7.15699 5.89688 7.09878C6.12414 6.9818 6.3773 6.81764 6.62277 6.6411C6.68842 6.59389 6.75246 6.54657 6.81414 6.5Z" fill="#262626"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
@@ -0,0 +1,12 @@
|
||||
name: HandKnot
|
||||
category: People
|
||||
sub_category: Hands
|
||||
keywords:
|
||||
- hånd
|
||||
- påminnelse
|
||||
- note
|
||||
- notat
|
||||
- reminder
|
||||
variant: Stroke
|
||||
updated_at: 21.04.2023
|
||||
created_at: 21.04.2023
|
||||
@@ -0,0 +1,3 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.25042 4.9681C7.26752 3.46401 8.4921 2.25 10.0002 2.25C11.5083 2.25 12.7328 3.46384 12.7501 4.96778C12.9619 4.82494 13.1895 4.68444 13.4166 4.56753C13.7115 4.41573 14.1053 4.25 14.5 4.25C15.7426 4.25 16.75 5.25736 16.75 6.5C16.75 7.74264 15.7426 8.75 14.5 8.75C14.1053 8.75 13.7115 8.58427 13.4166 8.43247C13.1896 8.31559 12.962 8.17514 12.7502 8.03235L12.7502 5V9.39837L18.2344 10.6171C20.2561 11.0663 21.5309 13.0695 21.0816 15.0913L19.7324 21.1627C19.6561 21.5059 19.3518 21.75 19.0002 21.75H8.00024C7.76417 21.75 7.54188 21.6389 7.40024 21.45L2.42616 14.8179C1.61354 13.7344 1.72129 12.2183 2.67896 11.2606C3.68453 10.255 5.29475 10.1932 6.37448 11.1187L7.25024 11.8693L7.25024 8.03202C7.03831 8.17493 6.8106 8.31551 6.58336 8.43247C6.28845 8.58427 5.89474 8.75 5.5 8.75C4.25736 8.75 3.25 7.74264 3.25 6.5C3.25 5.25736 4.25736 4.25 5.5 4.25C5.89474 4.25 6.28845 4.41573 6.58336 4.56753C6.81067 4.68453 7.03844 4.82515 7.25042 4.9681ZM12 7C12 7.13807 11.8881 7.25 11.75 7.25H8.25C8.11193 7.25 8 7.13807 8 7V6C8 5.86193 8.11193 5.75 8.25 5.75H11.75C11.8881 5.75 12 5.86193 12 6V7ZM6.62277 6.3589C6.68842 6.40611 6.75246 6.45343 6.81414 6.5C6.75246 6.54657 6.68842 6.59389 6.62277 6.6411C6.3773 6.81764 6.12414 6.9818 5.89688 7.09878C5.78379 7.15699 5.68809 7.19778 5.61143 7.22293C5.53915 7.24665 5.50417 7.24965 5.5 7.25C5.08579 7.25 4.75 6.91421 4.75 6.5C4.75 6.08579 5.08604 5.75005 5.50025 5.75005C5.50443 5.7504 5.53915 5.75335 5.61143 5.77707C5.68809 5.80222 5.78379 5.84301 5.89688 5.90122C6.12414 6.0182 6.3773 6.18236 6.62277 6.3589ZM13.3772 6.6411C13.3116 6.59389 13.2475 6.54657 13.1859 6.5C13.2475 6.45343 13.3116 6.40611 13.3772 6.3589C13.6227 6.18236 13.8759 6.0182 14.1031 5.90122C14.2162 5.84301 14.3119 5.80222 14.3886 5.77707C14.4608 5.75335 14.4958 5.75035 14.5 5.75C14.9142 5.75 15.25 6.08579 15.25 6.5C15.25 6.91421 14.914 7.24995 14.4997 7.24995C14.4956 7.2496 14.4608 7.24665 14.3886 7.22293C14.3119 7.19778 14.2162 7.15699 14.1031 7.09878C13.8759 6.9818 13.6227 6.81764 13.3772 6.6411Z" fill="#262626"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
@@ -0,0 +1,12 @@
|
||||
name: HandKnotFilled
|
||||
category: People
|
||||
sub_category: Hands
|
||||
keywords:
|
||||
- hånd
|
||||
- påminnelse
|
||||
- note
|
||||
- notat
|
||||
- reminder
|
||||
variant: Filled
|
||||
updated_at: 21.04.2023
|
||||
created_at: 21.04.2023
|
||||
@@ -10,5 +10,5 @@ keywords:
|
||||
- wardrobe
|
||||
- kleshenger
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 18.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -7,5 +7,5 @@ keywords:
|
||||
- grid
|
||||
- rutenett
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 19.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -13,5 +13,5 @@ keywords:
|
||||
- papir
|
||||
- kontorrekvisita
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 18.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -11,5 +11,5 @@ keywords:
|
||||
- doctor
|
||||
- patient
|
||||
variant: Stroke
|
||||
updated_at: 08.03.2023
|
||||
updated_at: 18.04.2023
|
||||
created_at: 07.03.2023
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/aksel-icons",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"author": "Aksel | NAV",
|
||||
"homepage": "https://aksel.nav.no/ikoner",
|
||||
"repository": {
|
||||
@@ -17,7 +17,8 @@
|
||||
"svg"
|
||||
],
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"sideEffects": [
|
||||
"*.svg"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
dist
|
||||
@@ -0,0 +1,22 @@
|
||||
# @navikt/aksel
|
||||
|
||||
## 2.9.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/ds-css@2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/ds-css@2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [[`657b7f3f3`](https://github.com/navikt/aksel/commit/657b7f3f3e62c5ce3173e6c95a29fcd237ce7343)]:
|
||||
- @navikt/ds-css@2.9.0
|
||||
@@ -0,0 +1,17 @@
|
||||
# Aksel command line interface
|
||||
|
||||
CLI tool for managing CSS-imports and more when consuming Aksel-packages.
|
||||
|
||||
[Documentation](https://aksel.nav.no/preview/grunnleggende/kode/kommandolinje)
|
||||
|
||||
```bash
|
||||
run:
|
||||
npx @navikt/aksel
|
||||
|
||||
commands:
|
||||
css-imports: Generate css-imports for all components from Aksel
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
[MIT](https://github.com/navikt/aksel/blob/main/LICENCE)
|
||||
@@ -0,0 +1,14 @@
|
||||
export type AnswersT = {
|
||||
"config-type": "regular" | "easy" | "advanced";
|
||||
cdn: "yes" | "no";
|
||||
version: string;
|
||||
tailwind?: "yes" | "no";
|
||||
layers?: "yes" | "no";
|
||||
autoscan?: "yes" | "no";
|
||||
scandir?: string;
|
||||
imports?: string[];
|
||||
output: "print" | "clipboard" | "print-clipboard";
|
||||
};
|
||||
|
||||
export const ComponentPrefix = "C_";
|
||||
export const layerSuffix = " layer(aksel)";
|
||||
@@ -0,0 +1,175 @@
|
||||
import { AnswersT, ComponentPrefix, layerSuffix } from "./config.js";
|
||||
import {
|
||||
formCss,
|
||||
typoCss,
|
||||
componentsCss,
|
||||
StyleMappings,
|
||||
componentDir,
|
||||
rootDir,
|
||||
globalDir,
|
||||
} from "@navikt/ds-css/config/_mappings.js";
|
||||
import { inquiry } from "./inquiry.js";
|
||||
import clipboard from "clipboardy";
|
||||
import lodash from "lodash";
|
||||
import chalk from "chalk";
|
||||
|
||||
export async function generateImportOutput(answers: AnswersT) {
|
||||
const useCdn = answers.cdn === "yes";
|
||||
const useTailwind = answers.tailwind === "yes";
|
||||
const version = answers.version;
|
||||
|
||||
const imports = [];
|
||||
let importStr = "";
|
||||
|
||||
await inquiry(answers, [
|
||||
{
|
||||
type: "select",
|
||||
name: "output",
|
||||
message: "Output format",
|
||||
initial: "print-clipboard",
|
||||
choices: [
|
||||
{ message: "Clipboard & Print", name: "clipboard-print" },
|
||||
{ message: "Clipboard", name: "clipboard" },
|
||||
{ message: "Print", name: "print" },
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
answers["config-type"] === "regular"
|
||||
? imports.push(simpleOutput(useCdn, answers.layers === "yes", version))
|
||||
: imports.push(
|
||||
...advancedOutput(answers, useCdn, answers.layers === "yes", version)
|
||||
);
|
||||
|
||||
if (useTailwind) {
|
||||
importStr = `@import "tailwindcss/base";
|
||||
${imports.join("\n")}
|
||||
|
||||
@import "tailwindcss/components";
|
||||
@import "tailwindcss/utilities";
|
||||
`;
|
||||
} else {
|
||||
importStr = imports.join("\n");
|
||||
}
|
||||
|
||||
if (answers.output.includes("print")) {
|
||||
console.log(chalk.bold.cyan(`\nImports 🚀 \n`));
|
||||
console.log(chalk.green(`${importStr}`));
|
||||
}
|
||||
|
||||
if (useCdn) {
|
||||
console.log(chalk.bold.underline.cyan(`\nNotes on CDN-usage 📝`));
|
||||
console.log(
|
||||
`We recommend using Static imports, then uploading the your bundled static-files to your own CDN-instance.
|
||||
✔︎ This allows you to control the version of the CSS-files with package.json, and avoids desync between ds-react/ds-css.
|
||||
✔︎ Remember to add 'https://cdn.nav.no' to your applications CSP!`
|
||||
);
|
||||
}
|
||||
|
||||
if (useTailwind) {
|
||||
console.log(chalk.bold.underline.cyan(`\nNotes on Tailwind-use 📝`));
|
||||
console.log(
|
||||
`When using tailwind with Aksel, you will need to add the postcss plugin ${chalk.cyan(
|
||||
"postcss-import"
|
||||
)}
|
||||
✔︎ NPM: https://www.npmjs.com/package/postcss-import
|
||||
✔︎ Read more here: https://aksel.nav.no/grunnleggende/kode/tailwind`
|
||||
);
|
||||
}
|
||||
|
||||
if (answers.layers === "yes") {
|
||||
console.log(chalk.bold.underline.cyan(`\nNotes on Layers 📝`));
|
||||
console.log(
|
||||
`Layers is not yet supported in Safari <= 15.3. (https://caniuse.com/css-cascade-layers)`
|
||||
);
|
||||
}
|
||||
|
||||
answers.output.includes("clipboard") && clipboard.writeSync(importStr);
|
||||
}
|
||||
|
||||
function simpleOutput(cdn: boolean, layers: boolean, version: string) {
|
||||
const options = {
|
||||
static: `@import "@navikt/ds-css"${layers ? layerSuffix : ""};`,
|
||||
cdn: toCdn("index.css", version),
|
||||
};
|
||||
|
||||
return cdn ? options.cdn : options.static;
|
||||
}
|
||||
|
||||
function advancedOutput(
|
||||
answers: AnswersT,
|
||||
cdn: boolean,
|
||||
layers: boolean,
|
||||
version: string
|
||||
) {
|
||||
const imports = ["/* Defaults */"];
|
||||
const baselineImports = answers.imports.filter(
|
||||
(x) => !x.startsWith(ComponentPrefix) && x !== "default"
|
||||
);
|
||||
|
||||
const componentImports = answers.imports
|
||||
.filter((x) => x.startsWith(ComponentPrefix) && x !== "components")
|
||||
.map((x) => x.replace(ComponentPrefix, ""));
|
||||
|
||||
baselineImports.forEach((x) => {
|
||||
cdn
|
||||
? imports.push(toCdn(`${globalDir}/${x}.css`, version))
|
||||
: imports.push(toCssImport(`${globalDir}/${x}.css`, layers));
|
||||
});
|
||||
|
||||
if (answers["config-type"] === "easy") {
|
||||
cdn
|
||||
? imports.push(toCdn(componentsCss, version))
|
||||
: imports.push(toCssImport(`${rootDir}/${componentsCss}`, layers));
|
||||
return imports;
|
||||
}
|
||||
|
||||
const components = new Set();
|
||||
|
||||
componentImports.forEach((x) => {
|
||||
const styleRef = StyleMappings.components.find((y) => y.component === x);
|
||||
if (styleRef) {
|
||||
components.add(styleRef.main);
|
||||
styleRef?.dependencies?.forEach((dep) => components.add(dep));
|
||||
}
|
||||
});
|
||||
|
||||
let componentImportsList = (Array.from(components) as string[])
|
||||
.filter((x) => x.length > 0)
|
||||
.sort((a, b) => a.localeCompare(b));
|
||||
|
||||
if (componentImportsList.find((x) => x === formCss)) {
|
||||
componentImportsList = componentImportsList.filter((x) => x !== formCss);
|
||||
componentImportsList.unshift(formCss);
|
||||
}
|
||||
|
||||
if (componentImportsList.find((x) => x === typoCss)) {
|
||||
componentImportsList = componentImportsList.filter((x) => x !== typoCss);
|
||||
componentImportsList.unshift(typoCss);
|
||||
}
|
||||
if (componentImportsList.length === 0) {
|
||||
return imports;
|
||||
}
|
||||
|
||||
imports.push(``);
|
||||
imports.push(`/* Components */`);
|
||||
|
||||
componentImportsList.forEach((x) => {
|
||||
const pascalCase = lodash.camelCase(x.replace("css", "")).toLowerCase();
|
||||
cdn
|
||||
? imports.push(toCdn(`${componentDir}/${pascalCase}.css`, version))
|
||||
: imports.push(toCssImport(`${componentDir}/${pascalCase}.css`, layers));
|
||||
});
|
||||
|
||||
return imports;
|
||||
}
|
||||
|
||||
function toCdn(str: string, version: string): string {
|
||||
return `<link rel="preload" href="https://cdn.nav.no/aksel/@navikt/ds-css/${version}/${str
|
||||
.replace(".css", ".min.css")
|
||||
.replace(`${rootDir}/`, "")}" as="style"></link>`;
|
||||
}
|
||||
|
||||
function toCssImport(str: string, layers: boolean): string {
|
||||
return `@import "@navikt/ds-css/${str}"${layers ? layerSuffix : ""};`;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import fg from "fast-glob";
|
||||
import path from "path";
|
||||
|
||||
export async function getDirectories() {
|
||||
const baseDir = process.cwd();
|
||||
const ignoreNodeModules = [
|
||||
"**/node_modules/**",
|
||||
"**/dist/**",
|
||||
"**/build/**",
|
||||
"**/lib/**",
|
||||
];
|
||||
const directories = await fg(`${baseDir}/**`, {
|
||||
onlyDirectories: true,
|
||||
ignore: ignoreNodeModules,
|
||||
});
|
||||
|
||||
directories.sort((a, b) => a.length - b.length);
|
||||
|
||||
return [baseDir, ...directories].map((x) =>
|
||||
x.replace(baseDir, path.basename(baseDir))
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
import axios from "axios";
|
||||
|
||||
export async function getAllVersions() {
|
||||
try {
|
||||
const npmPackageData = await axios.get(
|
||||
`https://registry.npmjs.org/@navikt/ds-css`
|
||||
);
|
||||
return Object.keys(npmPackageData.data["versions"]);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
return [];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,199 @@
|
||||
import { StyleMappings } from "@navikt/ds-css/config/_mappings.js";
|
||||
import { generateImportOutput } from "./generate-output.js";
|
||||
import { AnswersT, ComponentPrefix } from "./config.js";
|
||||
|
||||
import { inquiry } from "./inquiry.js";
|
||||
import { exec } from "child_process";
|
||||
import { fileURLToPath } from "url";
|
||||
import { dirname } from "path";
|
||||
import { getAllVersions } from "./get-version.js";
|
||||
import chalk from "chalk";
|
||||
import { getDirectories } from "./get-directories.js";
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = dirname(__filename);
|
||||
|
||||
export async function cssImportsCommand() {
|
||||
let answers: AnswersT = {
|
||||
"config-type": "regular",
|
||||
cdn: "no",
|
||||
version: "0.0.0",
|
||||
autoscan: "no",
|
||||
scandir: "",
|
||||
tailwind: "no",
|
||||
layers: "no",
|
||||
imports: null,
|
||||
output: "print-clipboard",
|
||||
};
|
||||
|
||||
await inquiry(answers, [
|
||||
{
|
||||
type: "select",
|
||||
name: "config-type",
|
||||
message: "Import variants:",
|
||||
initial: 0,
|
||||
choices: [
|
||||
{ message: "Regular import (recommended)", name: "regular" },
|
||||
{ message: "Partial control (global)", name: "easy" },
|
||||
{ message: "Full control (global + components)", name: "advanced" },
|
||||
],
|
||||
footer() {
|
||||
return chalk.grey(
|
||||
`${chalk.cyan(
|
||||
`\n Documentation:`
|
||||
)}\n Regular: https://aksel.nav.no/grunnleggende/kode/css-import
|
||||
Partial: https://aksel.nav.no/grunnleggende/kode/css-import#h64650b1a4ad6
|
||||
Full: https://aksel.nav.no/grunnleggende/kode/css-import#h4037598416ef\n`
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
name: "cdn",
|
||||
message: "Import format",
|
||||
initial: 0,
|
||||
choices: [
|
||||
{ message: "Static import (default)", name: "no" },
|
||||
{ message: "CDN import (not recommended)", name: "yes" },
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
if (answers?.cdn === "no") {
|
||||
await inquiry(answers, [
|
||||
{
|
||||
type: "select",
|
||||
name: "tailwind",
|
||||
message: "Add tailwind support?",
|
||||
initial: 0,
|
||||
choices: [
|
||||
{ message: "No", name: "no" },
|
||||
{ message: "Yes", name: "yes" },
|
||||
],
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
name: "layers",
|
||||
message: "Add styling to custom @layer rule?",
|
||||
initial: 0,
|
||||
choices: [
|
||||
{ message: "No", name: "no" },
|
||||
{ message: "Yes", name: "yes" },
|
||||
],
|
||||
},
|
||||
]);
|
||||
} else {
|
||||
let versions = (await getAllVersions()).filter((x) => !x.includes("-"));
|
||||
|
||||
const index = versions.findIndex((x) => x.startsWith("2.9.0"));
|
||||
versions = versions.slice(index).reverse();
|
||||
|
||||
await inquiry(answers, [
|
||||
{
|
||||
type: "autocomplete",
|
||||
name: "version",
|
||||
message: `@navikt/ds-css version from CDN:`,
|
||||
limit: 6,
|
||||
initial: 0,
|
||||
choices: versions,
|
||||
footer() {
|
||||
return chalk.grey(
|
||||
'Remember to match version with @navikt/ds-react!\nNote: CDN was introduced in v2.9.0, older versions not available.\nUse "static" import instead.'
|
||||
);
|
||||
},
|
||||
},
|
||||
]);
|
||||
}
|
||||
|
||||
if (answers["config-type"] === "regular") {
|
||||
await generateImportOutput(answers);
|
||||
return;
|
||||
}
|
||||
|
||||
answers["config-type"] === "advanced" &&
|
||||
(await inquiry(answers, [
|
||||
{
|
||||
type: "select",
|
||||
name: "autoscan",
|
||||
message: "Scan current directory for '@navikt/ds-react' components?",
|
||||
initial: 0,
|
||||
choices: [
|
||||
{ message: "No", name: "no" },
|
||||
{ message: "Yes", name: "yes" },
|
||||
],
|
||||
},
|
||||
]));
|
||||
|
||||
answers.autoscan === "yes" &&
|
||||
(await inquiry(answers, [
|
||||
{
|
||||
type: "autocomplete",
|
||||
name: "scandir",
|
||||
message: `Directory to scan`,
|
||||
limit: 6,
|
||||
initial: 0,
|
||||
choices: getDirectories(),
|
||||
footer() {
|
||||
return chalk.grey(
|
||||
"filtered out: node_moduels, dist, build, lib, .* (dotfiles)"
|
||||
);
|
||||
},
|
||||
},
|
||||
]));
|
||||
|
||||
let foundComponents: string[] = [];
|
||||
|
||||
if (answers["autoscan"] === "yes") {
|
||||
foundComponents = await new Promise((resolve) => {
|
||||
exec(`node ${__dirname}/scan-code.js ${answers.scandir}`, (_, stdout) => {
|
||||
resolve(
|
||||
stdout ? JSON.parse(stdout.trim().split("\n").slice(1).join("")) : []
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
await inquiry(answers, [
|
||||
{
|
||||
type: "multiselect",
|
||||
name: "imports",
|
||||
message: "Imports",
|
||||
initial: [
|
||||
...StyleMappings.baseline.map((x) => x.main.replace(".css", "")),
|
||||
...StyleMappings.components
|
||||
.filter((x) => foundComponents.includes(x.component))
|
||||
.map((x) => `${ComponentPrefix}${x.component}`),
|
||||
],
|
||||
choices: [
|
||||
{
|
||||
message: "Default-imports",
|
||||
name: "default",
|
||||
choices: [
|
||||
...StyleMappings.baseline.map((x) => ({
|
||||
message: `${x.main.replace(".css", "")}${
|
||||
x.optional ? "" : " (required)"
|
||||
}`,
|
||||
name: x.main.replace(".css", ""),
|
||||
})),
|
||||
],
|
||||
},
|
||||
...(answers["config-type"] === "advanced"
|
||||
? [
|
||||
{
|
||||
message: "Components",
|
||||
name: "components",
|
||||
choices: [
|
||||
...StyleMappings.components.map((x) => ({
|
||||
message: x.component,
|
||||
name: `${ComponentPrefix}${x.component}`,
|
||||
})),
|
||||
],
|
||||
},
|
||||
]
|
||||
: []),
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
await generateImportOutput(answers);
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
import Enquirer from "enquirer";
|
||||
import { AnswersT } from "./config.js";
|
||||
import chalk from "chalk";
|
||||
|
||||
export async function inquiry(answers: AnswersT, questions: any[]) {
|
||||
return await Enquirer.prompt(
|
||||
questions.map((x) => ({
|
||||
...x,
|
||||
cancel: () => process.exit(1),
|
||||
header: `\n${chalk.gray(
|
||||
"Command 'css-imports' will not edit your files directly!"
|
||||
)}\n`,
|
||||
}))
|
||||
)
|
||||
.then((a) => {
|
||||
Object.entries(a).forEach(([key, value]) => {
|
||||
answers[key] = value;
|
||||
});
|
||||
})
|
||||
.catch((error) => {
|
||||
if (error.isTtyError) {
|
||||
console.log(
|
||||
"Oops, something went wrong! Looks like @navikt/aksel-cli can't run in this terminal. Contact Aksel"
|
||||
);
|
||||
} else {
|
||||
console.error(error);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
import path from "path";
|
||||
import scanner from "react-scanner";
|
||||
|
||||
run();
|
||||
|
||||
async function run() {
|
||||
await scanCode();
|
||||
}
|
||||
|
||||
async function scanCode() {
|
||||
const cwd = process.cwd();
|
||||
|
||||
const config = {
|
||||
rootDir: cwd,
|
||||
crawlFrom: `${process.argv[2] ?? ""}`.replace(path.basename(cwd), "."),
|
||||
|
||||
globs: ["**/!(*.test|*.spec|*.stories|*.story).@(jsx|tsx)"],
|
||||
exclude: (dirname: string) => dirname === "node_modules",
|
||||
getComponentName: ({
|
||||
imported,
|
||||
moduleName,
|
||||
}: {
|
||||
imported: string;
|
||||
moduleName: string;
|
||||
}) => imported || path.basename(moduleName),
|
||||
};
|
||||
|
||||
let result: any | null = null;
|
||||
|
||||
await scanner
|
||||
.run({
|
||||
...config,
|
||||
importedFrom: /@navikt\/ds-react/,
|
||||
processors: [
|
||||
"count-components",
|
||||
({ report }) => {
|
||||
result = report;
|
||||
},
|
||||
],
|
||||
})
|
||||
.catch(() => null);
|
||||
|
||||
console.log(JSON.stringify(Object.keys(result)));
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
import chalk from "chalk";
|
||||
import figlet from "figlet";
|
||||
|
||||
export function helpCommand() {
|
||||
console.log(figlet.textSync("Aksel CLI"));
|
||||
console.log(`
|
||||
📝 Documentation
|
||||
- ${chalk.blueBright(
|
||||
"https://aksel.nav.no/grunnleggende/kode/kommandolinje"
|
||||
)}
|
||||
|
||||
💻 Commands:
|
||||
- ${chalk.cyan(`npx @navikt/aksel ${chalk.green("css-imports")}`)}
|
||||
✔︎ Helps with CSS imports for all Aksel components
|
||||
✔︎ Supports Static and CDN-imports
|
||||
✔︎ Handles cascading, tailwind and @layer rules
|
||||
`);
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env node
|
||||
import chalk from "chalk";
|
||||
import { helpCommand } from "./help.js";
|
||||
import { cssImportsCommand } from "./css-imports/index.js";
|
||||
|
||||
run();
|
||||
|
||||
async function run() {
|
||||
if (!process.argv[2] || process.argv[2] === "help") {
|
||||
helpCommand();
|
||||
return;
|
||||
} else if (process.argv[2] === "css-imports") {
|
||||
await cssImportsCommand();
|
||||
return;
|
||||
} else {
|
||||
console.log(
|
||||
chalk.red(
|
||||
`Unknown command: ${process.argv[2]}.\nRun ${chalk.cyan(
|
||||
"npx @navikt/aksel help"
|
||||
)} for all available commands.`
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
"name": "@navikt/aksel",
|
||||
"version": "2.9.2",
|
||||
"description": "Aksel command line interface. Handles css-imports, codemods (planned) and more",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"license": "MIT",
|
||||
"keywords": [
|
||||
"react",
|
||||
"command-line",
|
||||
"CLI",
|
||||
"css",
|
||||
"CDN"
|
||||
],
|
||||
"files": [
|
||||
"dist"
|
||||
],
|
||||
"scripts": {
|
||||
"clean": "rimraf dist",
|
||||
"build": "yarn clean && tsc -p tsconfig.json",
|
||||
"dev": "tsc --watch -p tsconfig.json"
|
||||
},
|
||||
"bin": "./dist/index.js",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/navikt/aksel.git",
|
||||
"directory": "@navikt/aksel"
|
||||
},
|
||||
"type": "module",
|
||||
"homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
|
||||
"dependencies": {
|
||||
"@navikt/ds-css": "2.9.2",
|
||||
"axios": "1.3.6",
|
||||
"chalk": "4.1.0",
|
||||
"clipboardy": "^3.0.0",
|
||||
"enquirer": "^2.3.6",
|
||||
"fast-glob": "3.2.11",
|
||||
"figlet": "1.6.0",
|
||||
"lodash": "4.17.21",
|
||||
"react-scanner": "^1.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/inquirer": "^9.0.3",
|
||||
"rimraf": "3.0.2",
|
||||
"typescript": "^4.8.0"
|
||||
},
|
||||
"sideEffects": false,
|
||||
"engines": {
|
||||
"node": ">=16.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"module": "Node16",
|
||||
"sourceMap": false,
|
||||
"esModuleInterop": true,
|
||||
"target": "es2015",
|
||||
"preserveWatchOutput": true,
|
||||
"declaration": false,
|
||||
"types": ["node", "jest"],
|
||||
"outDir": "dist",
|
||||
"rootDir": "./",
|
||||
"resolveJsonModule": true
|
||||
},
|
||||
"include": ["**/*.ts"],
|
||||
"exclude": ["node_modules", "dist", "jest.config.js", "__tests__"]
|
||||
}
|
||||
@@ -1,5 +1,21 @@
|
||||
# @navikt/ds-codemod
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-codemod",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Aksel codemods for NAVs designsystem",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"license": "MIT",
|
||||
@@ -59,6 +59,7 @@
|
||||
"node": ">=12.0.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,8 @@
|
||||
"module": "./esm/index.js",
|
||||
"typings": "./esm/index.d.ts",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"files": [
|
||||
"/css",
|
||||
@@ -39,8 +40,8 @@
|
||||
"build-pict": "svgr --silent --index-template index-template.js --out-dir src/pictograms pictograms"
|
||||
},
|
||||
"dependencies": {
|
||||
"@navikt/ds-icons": "^2.8.13",
|
||||
"@navikt/ds-react": "^2.8.13",
|
||||
"@navikt/ds-icons": "^2.9.2",
|
||||
"@navikt/ds-react": "^2.9.2",
|
||||
"clsx": "^1.1.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
!*.d.ts
|
||||
@@ -1,5 +1,33 @@
|
||||
# @navikt/ds-css
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
### Minor Changes
|
||||
|
||||
- [#1941](https://github.com/navikt/aksel/pull/1941) [`657b7f3f3`](https://github.com/navikt/aksel/commit/657b7f3f3e62c5ce3173e6c95a29fcd237ce7343) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :tada: CSS nå tilgjengelig som separate filer
|
||||
|
||||
- Kan lastest fra CDN
|
||||
- Tilbys nå i minified-versjoner
|
||||
- Kommandoline: `npx @navikt/aksel css-imports` for å raskt komme i gang med CSS-optimalisering
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [`f0d9a8853`](https://github.com/navikt/aksel/commit/f0d9a8853f56854a4049bd3f6cc34968e9d6c380) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Fixes shown month on open in Datepicker/MonthPicker, better handling of out-of-range 'today'
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
html,
|
||||
:host {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: inherit;
|
||||
}
|
||||
|
||||
button,
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit;
|
||||
font-size: 100%;
|
||||
line-height: 1.15;
|
||||
margin: 0;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
button,
|
||||
input {
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
button,
|
||||
[type="button"],
|
||||
[type="reset"],
|
||||
[type="submit"] {
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
legend {
|
||||
box-sizing: border-box;
|
||||
color: inherit;
|
||||
display: table;
|
||||
max-width: 100%;
|
||||
padding: 0;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
[hidden] {
|
||||
display: none;
|
||||
}
|
||||
@@ -1,3 +1,18 @@
|
||||
/* https://web.dev/prefers-reduced-motion/ */
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
*:not(.navds-loader *):not(.navds-loader),
|
||||
::before,
|
||||
::after {
|
||||
animation-delay: -1ms !important;
|
||||
animation-duration: 1ms !important;
|
||||
animation-iteration-count: 1 !important;
|
||||
background-attachment: initial !important;
|
||||
scroll-behavior: auto !important;
|
||||
transition-duration: 0s !important;
|
||||
transition-delay: 0s !important;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* From https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/style.css
|
||||
*
|
||||
@@ -20,17 +35,15 @@
|
||||
position: absolute;
|
||||
white-space: nowrap;
|
||||
width: 1px;
|
||||
|
||||
/* 1 */
|
||||
}
|
||||
|
||||
/*
|
||||
* From https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/style.css
|
||||
*
|
||||
* Extends the .sr-only class to allow the element
|
||||
* to be focusable when navigated to via the keyboard:
|
||||
* https://www.drupal.org/node/897638
|
||||
*/
|
||||
* From https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/style.css
|
||||
*
|
||||
* Extends the .sr-only class to allow the element
|
||||
* to be focusable when navigated to via the keyboard:
|
||||
* https://www.drupal.org/node/897638
|
||||
*/
|
||||
|
||||
.sr-only.focusable:active,
|
||||
.sr-only.focusable:focus,
|
||||
@@ -1,19 +1,5 @@
|
||||
@import "@navikt/ds-tokens";
|
||||
@import "normalize.css";
|
||||
@import "fonts.css";
|
||||
@import "print.css";
|
||||
@import "utility.css";
|
||||
|
||||
html,
|
||||
:host {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: inherit;
|
||||
}
|
||||
@import "./_inline-reset.css";
|
||||
@import "./_utilities.css";
|
||||
|
||||
:root,
|
||||
:host,
|
||||
@@ -39,22 +25,3 @@ body,
|
||||
a {
|
||||
color: var(--a-text-action);
|
||||
}
|
||||
|
||||
button {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
/* https://web.dev/prefers-reduced-motion/ */
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
*:not(.navds-loader *):not(.navds-loader),
|
||||
::before,
|
||||
::after {
|
||||
animation-delay: -1ms !important;
|
||||
animation-duration: 1ms !important;
|
||||
animation-iteration-count: 1 !important;
|
||||
background-attachment: initial !important;
|
||||
scroll-behavior: auto !important;
|
||||
transition-duration: 0s !important;
|
||||
transition-delay: 0s !important;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
@import "@navikt/ds-tokens";
|
||||
@import "reset.css";
|
||||
@import "fonts.css";
|
||||
@import "print.css";
|
||||
@import "baseline.css";
|
||||
@@ -0,0 +1,294 @@
|
||||
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
|
||||
|
||||
/* Document
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Correct the line height in all browsers.
|
||||
* 2. Prevent adjustments of font size after orientation changes in iOS.
|
||||
*/
|
||||
|
||||
html {
|
||||
line-height: 1.15; /* 1 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */
|
||||
}
|
||||
|
||||
/* Sections
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the margin in all browsers.
|
||||
*/
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render the `main` element consistently in IE.
|
||||
*/
|
||||
|
||||
main {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the font size and margin on `h1` elements within `section` and
|
||||
* `article` contexts in Chrome, Firefox, and Safari.
|
||||
*/
|
||||
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
margin: 0.67em 0;
|
||||
}
|
||||
|
||||
/* Grouping content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Add the correct box sizing in Firefox.
|
||||
* 2. Show the overflow in Edge and IE.
|
||||
*/
|
||||
|
||||
hr {
|
||||
box-sizing: content-box; /* 1 */
|
||||
height: 0; /* 1 */
|
||||
overflow: visible; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inheritance and scaling of font size in all browsers.
|
||||
* 2. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
pre {
|
||||
font-family: monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
/* Text-level semantics
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the gray background on active links in IE 10.
|
||||
*/
|
||||
|
||||
a {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Remove the bottom border in Chrome 57-
|
||||
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
|
||||
*/
|
||||
|
||||
abbr[title] {
|
||||
border-bottom: none; /* 1 */
|
||||
text-decoration: underline; /* 2 */
|
||||
text-decoration: underline dotted; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct font weight in Chrome, Edge, and Safari.
|
||||
*/
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inheritance and scaling of font size in all browsers.
|
||||
* 2. Correct the odd `em` font sizing in all browsers.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
samp {
|
||||
font-family: monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct font size in all browsers.
|
||||
*/
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent `sub` and `sup` elements from affecting the line height in
|
||||
* all browsers.
|
||||
*/
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
/* Embedded content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the border on images inside links in IE 10.
|
||||
*/
|
||||
|
||||
img {
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
/* Forms
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the inner border and padding in Firefox.
|
||||
*/
|
||||
|
||||
button::-moz-focus-inner,
|
||||
[type="button"]::-moz-focus-inner,
|
||||
[type="reset"]::-moz-focus-inner,
|
||||
[type="submit"]::-moz-focus-inner {
|
||||
border-style: none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the focus styles unset by the previous rule.
|
||||
*/
|
||||
|
||||
button:-moz-focusring,
|
||||
[type="button"]:-moz-focusring,
|
||||
[type="reset"]:-moz-focusring,
|
||||
[type="submit"]:-moz-focusring {
|
||||
outline: 1px dotted ButtonText;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the padding in Firefox.
|
||||
*/
|
||||
|
||||
fieldset {
|
||||
padding: 0.35em 0.75em 0.625em;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the text wrapping in Edge and IE.
|
||||
* 2. Correct the color inheritance from `fieldset` elements in IE.
|
||||
* 3. Remove the padding so developers are not caught out when they zero out
|
||||
* `fieldset` elements in all browsers.
|
||||
*/
|
||||
|
||||
legend {
|
||||
box-sizing: border-box; /* 1 */
|
||||
color: inherit; /* 2 */
|
||||
display: table; /* 1 */
|
||||
max-width: 100%; /* 1 */
|
||||
padding: 0; /* 3 */
|
||||
white-space: normal; /* 1 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
|
||||
*/
|
||||
|
||||
progress {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the default vertical scrollbar in IE 10+.
|
||||
*/
|
||||
|
||||
textarea {
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Add the correct box sizing in IE 10.
|
||||
* 2. Remove the padding in IE 10.
|
||||
*/
|
||||
|
||||
[type="checkbox"],
|
||||
[type="radio"] {
|
||||
box-sizing: border-box; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct the cursor style of increment and decrement buttons in Chrome.
|
||||
*/
|
||||
|
||||
[type="number"]::-webkit-inner-spin-button,
|
||||
[type="number"]::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the odd appearance in Chrome and Safari.
|
||||
* 2. Correct the outline style in Safari.
|
||||
*/
|
||||
|
||||
[type="search"] {
|
||||
-webkit-appearance: textfield; /* 1 */
|
||||
outline-offset: -2px; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the inner padding in Chrome and Safari on macOS.
|
||||
*/
|
||||
|
||||
[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct the inability to style clickable types in iOS and Safari.
|
||||
* 2. Change font properties to `inherit` in Safari.
|
||||
*/
|
||||
|
||||
::-webkit-file-upload-button {
|
||||
-webkit-appearance: button; /* 1 */
|
||||
font: inherit; /* 2 */
|
||||
}
|
||||
|
||||
/* Interactive
|
||||
========================================================================== */
|
||||
|
||||
/*
|
||||
* Add the correct display in Edge, IE 10+, and Firefox.
|
||||
*/
|
||||
|
||||
details {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add the correct display in all browsers.
|
||||
*/
|
||||
|
||||
summary {
|
||||
display: list-item;
|
||||
}
|
||||
|
||||
/* Misc
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Add the correct display in IE 10+.
|
||||
*/
|
||||
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
@import "@navikt/ds-tokens";
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
export declare const rootDir = "dist";
|
||||
export declare const globalDir = "dist/global";
|
||||
export declare const componentDir = "dist/component";
|
||||
export declare const typoCss = "typography.css";
|
||||
export declare const formCss = "form.css";
|
||||
export declare const componentsCss = "components.css";
|
||||
export declare const StyleMappings: {
|
||||
baseline: {
|
||||
main: string;
|
||||
optional: boolean;
|
||||
}[];
|
||||
components: (
|
||||
| {
|
||||
component: string;
|
||||
main: string;
|
||||
dependencies: string[];
|
||||
}
|
||||
| {
|
||||
component: string;
|
||||
main: string;
|
||||
dependencies?: undefined;
|
||||
}
|
||||
)[];
|
||||
};
|
||||
@@ -0,0 +1,149 @@
|
||||
const rootDir = "dist";
|
||||
const globalDir = "dist/global";
|
||||
const componentDir = "dist/component";
|
||||
|
||||
const typoCss = "typography.css";
|
||||
const formCss = "form.css";
|
||||
const componentsCss = "components.css";
|
||||
|
||||
const StyleMappings = {
|
||||
baseline: [
|
||||
{
|
||||
main: "fonts.css",
|
||||
optional: false,
|
||||
},
|
||||
{
|
||||
main: "tokens.css",
|
||||
optional: false,
|
||||
},
|
||||
{
|
||||
main: "reset.css",
|
||||
optional: true,
|
||||
},
|
||||
{
|
||||
main: "baseline.css",
|
||||
optional: false,
|
||||
},
|
||||
{
|
||||
main: "print.css",
|
||||
optional: true,
|
||||
},
|
||||
],
|
||||
components: [
|
||||
{
|
||||
component: "Accordion",
|
||||
main: "accordion.css",
|
||||
dependencies: [typoCss],
|
||||
},
|
||||
{ component: "Alert", main: "alert.css", dependencies: [typoCss] },
|
||||
{
|
||||
component: "BodyLong",
|
||||
main: typoCss,
|
||||
},
|
||||
{
|
||||
component: "BodyShort",
|
||||
main: typoCss,
|
||||
},
|
||||
{
|
||||
component: "Button",
|
||||
main: "button.css",
|
||||
dependencies: [typoCss, "loader.css"],
|
||||
},
|
||||
{ component: "Cell", main: "grid.css" },
|
||||
{ component: "Chat", main: "chat.css", dependencies: [typoCss] },
|
||||
{ component: "Checkbox", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "CheckboxGroup", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Chips", main: "chips.css", dependencies: [typoCss] },
|
||||
{
|
||||
component: "ConfirmationPanel",
|
||||
main: formCss,
|
||||
dependencies: [typoCss],
|
||||
},
|
||||
{
|
||||
component: "ContentContainer",
|
||||
main: "content-container.css",
|
||||
},
|
||||
{ component: "Detail", main: typoCss },
|
||||
{ component: "ErrorMessage", main: typoCss },
|
||||
{ component: "ErrorSummary", main: formCss, dependencies: [typoCss] },
|
||||
{
|
||||
component: "ExpansionCard",
|
||||
main: "expansion-card.css",
|
||||
dependencies: [typoCss],
|
||||
},
|
||||
{ component: "Fieldset", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Grid", main: "grid.css", dependencies: [typoCss] },
|
||||
{
|
||||
component: "GuidePanel",
|
||||
main: "guide-panel.css",
|
||||
dependencies: [typoCss],
|
||||
},
|
||||
{ component: "Heading", main: typoCss, dependencies: [typoCss] },
|
||||
{
|
||||
component: "HelpText",
|
||||
main: "help-text.css",
|
||||
dependencies: ["popover.css"],
|
||||
},
|
||||
{ component: "Ingress", main: typoCss },
|
||||
{ component: "Label", main: typoCss },
|
||||
{ component: "Link", main: "link.css", dependencies: [typoCss] },
|
||||
{
|
||||
component: "LinkPanel",
|
||||
main: "link-panel.css",
|
||||
dependencies: [typoCss, "panel.css"],
|
||||
},
|
||||
{ component: "List", main: "list.css", dependencies: [typoCss] },
|
||||
{ component: "Loader", main: "loader.css" },
|
||||
{
|
||||
component: "Modal",
|
||||
main: "modal.css",
|
||||
dependencies: ["button.css"],
|
||||
},
|
||||
{
|
||||
component: "Pagination",
|
||||
main: "pagination.css",
|
||||
dependencies: [typoCss, "button.css"],
|
||||
},
|
||||
{ component: "Panel", main: "panel.css" },
|
||||
{ component: "Popover", main: "popover.css" },
|
||||
{ component: "Provider", main: "" },
|
||||
{ component: "Radio", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "RadioGroup", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "ReadMore", main: "read-more.css", dependencies: [typoCss] },
|
||||
{ component: "Search", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Select", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Stepper", main: "stepper.css", dependencies: [typoCss] },
|
||||
{ component: "Switch", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Table", main: "table.css", dependencies: [typoCss] },
|
||||
{ component: "Tabs", main: "tabs.css", dependencies: [typoCss] },
|
||||
{ component: "Tag", main: "tag.css", dependencies: [typoCss] },
|
||||
{ component: "TextField", main: formCss, dependencies: [typoCss] },
|
||||
{ component: "Textarea", main: formCss, dependencies: [typoCss] },
|
||||
{
|
||||
component: "ToggleGroup",
|
||||
main: "toggle-group.css",
|
||||
dependencies: [typoCss],
|
||||
},
|
||||
{ component: "Tooltip", main: "tooltip.css", dependencies: [typoCss] },
|
||||
{
|
||||
component: "UNSAFE_DatePicker",
|
||||
main: "date.css",
|
||||
dependencies: [typoCss, "button.css", "popover.css"],
|
||||
},
|
||||
{
|
||||
component: "UNSAFE_MonthPicker",
|
||||
main: "date.css",
|
||||
dependencies: [typoCss, "button.css", "popover.css"],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
StyleMappings,
|
||||
typoCss,
|
||||
formCss,
|
||||
componentsCss,
|
||||
rootDir,
|
||||
globalDir,
|
||||
componentDir,
|
||||
};
|
||||
@@ -0,0 +1,159 @@
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
const fastglob = require("fast-glob");
|
||||
const { camelCase } = require("lodash");
|
||||
const postcss = require("postcss");
|
||||
const autoprefixer = require("autoprefixer");
|
||||
const combineSelectors = require("postcss-combine-duplicated-selectors");
|
||||
const cssImports = require("postcss-import");
|
||||
const cssnano = require("cssnano");
|
||||
const getDirName = require("path").dirname;
|
||||
const version = require("../package.json").version;
|
||||
const {
|
||||
StyleMappings,
|
||||
componentsCss,
|
||||
formCss,
|
||||
rootDir,
|
||||
globalDir,
|
||||
componentDir,
|
||||
} = require("./_mappings.js");
|
||||
|
||||
run();
|
||||
|
||||
/**
|
||||
* Postcss-plugins
|
||||
* - cssImports: Inline of imports from other css files
|
||||
* - combineSelectors: Combine selectors with the same properties, removes duplicates
|
||||
* Minified-versions:
|
||||
* - autoprefixer: Add vendor prefixes, uses browserlist in package.json
|
||||
* - cssnano: css-minification
|
||||
*/
|
||||
async function run() {
|
||||
[`${rootDir}/version/${version}`, globalDir, componentDir].forEach((dir) => {
|
||||
if (!fs.existsSync(path.resolve(__dirname, `../${dir}`))) {
|
||||
fs.mkdirSync(path.resolve(__dirname, `../${dir}`), { recursive: true });
|
||||
}
|
||||
});
|
||||
|
||||
await bundleMonolith();
|
||||
await bundleComponents();
|
||||
await bundleFragments();
|
||||
await bundleMinified();
|
||||
copyToVersionFolder();
|
||||
}
|
||||
|
||||
async function bundleMonolith() {
|
||||
const indexSrc = path.resolve(__dirname, "../index.css");
|
||||
const indexDist = path.resolve(__dirname, `../${rootDir}/index.css`);
|
||||
|
||||
const css = fs.readFileSync(indexSrc);
|
||||
const result = await postcss([cssImports, combineSelectors]).process(css, {
|
||||
from: indexSrc,
|
||||
to: indexDist,
|
||||
});
|
||||
|
||||
fs.writeFileSync(indexDist, result.css);
|
||||
}
|
||||
|
||||
/**
|
||||
* Bundle Components together for flexible import-options
|
||||
*/
|
||||
async function bundleComponents() {
|
||||
const indexSrc = path.resolve(__dirname, "../index.css");
|
||||
const indexDist = path.resolve(__dirname, `../${rootDir}/${componentsCss}`);
|
||||
|
||||
const css = fs.readFileSync(indexSrc);
|
||||
|
||||
/* Remove @charset, baseline */
|
||||
const cssString = css.toString().split("\n").slice(2).join("\n");
|
||||
|
||||
const result = await postcss([cssImports, combineSelectors]).process(
|
||||
cssString,
|
||||
{
|
||||
from: indexSrc,
|
||||
to: indexDist,
|
||||
}
|
||||
);
|
||||
|
||||
fs.writeFileSync(indexDist, result.css);
|
||||
}
|
||||
|
||||
/**
|
||||
* Postcss-plugins
|
||||
* - cssImports: Handle inline of imports from other css files
|
||||
* - combineSelectors: Combine selectors with the same properties
|
||||
*/
|
||||
async function bundleFragments() {
|
||||
const files = buildFragmentFiles();
|
||||
|
||||
for (let file of files) {
|
||||
const css = fs.readFileSync(file.input, { encoding: "utf-8" });
|
||||
const result = await postcss([cssImports, combineSelectors]).process(css, {
|
||||
from: file.input,
|
||||
to: file.output,
|
||||
});
|
||||
|
||||
fs.writeFileSync(file.output, result.css);
|
||||
}
|
||||
}
|
||||
|
||||
function buildFragmentFiles() {
|
||||
const files = fastglob
|
||||
.sync("*.css", { cwd: ".", ignore: "**/*.min.css" })
|
||||
.map((fileN) => path.basename(fileN))
|
||||
.map((x) => ({
|
||||
input: path.resolve(__dirname, `../${x}`),
|
||||
output: path.resolve(
|
||||
__dirname,
|
||||
`../${componentDir}/${camelCase(x.replace("css", ""))
|
||||
.toLowerCase()
|
||||
.replace(/ /g, "")}.css`
|
||||
),
|
||||
}));
|
||||
|
||||
StyleMappings.baseline.forEach(({ main }) => {
|
||||
files.push({
|
||||
input: `baseline/${main}`,
|
||||
output: `${globalDir}/${main}`,
|
||||
});
|
||||
});
|
||||
|
||||
files.push({
|
||||
input: "form/index.css",
|
||||
output: `${componentDir}/${formCss}`,
|
||||
});
|
||||
|
||||
return files;
|
||||
}
|
||||
|
||||
async function bundleMinified() {
|
||||
const files = fastglob
|
||||
.sync("**/*.css", { cwd: `./${rootDir}`, ignore: "**/*.min.css" })
|
||||
.map((x) => ({
|
||||
input: `${rootDir}/${x}`,
|
||||
output: `${rootDir}/${x}`.replace("css", "min.css"),
|
||||
}));
|
||||
|
||||
for (let file of files) {
|
||||
const css = fs.readFileSync(file.input, { encoding: "utf-8" });
|
||||
const result = await postcss([autoprefixer, cssnano]).process(css, {
|
||||
from: file.input,
|
||||
to: file.output,
|
||||
});
|
||||
|
||||
fs.writeFileSync(file.output, result.css);
|
||||
}
|
||||
}
|
||||
|
||||
function copyToVersionFolder() {
|
||||
const files = fastglob.sync("**/*.css", { cwd: `./${rootDir}` });
|
||||
|
||||
for (let file of files) {
|
||||
const css = fs.readFileSync(`${rootDir}/${file}`, { encoding: "utf-8" });
|
||||
|
||||
const filename = `${rootDir}/version/${version}/${file}`;
|
||||
fs.mkdirSync(getDirName(filename), { recursive: true });
|
||||
|
||||
fs.writeFileSync(filename, css);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
const packageJson = require("../package.json");
|
||||
|
||||
/* Make package-version accessible for github-workflow */
|
||||
console.log(packageJson.version);
|
||||
@@ -163,7 +163,8 @@
|
||||
gap: var(--a-spacing-2);
|
||||
}
|
||||
|
||||
.navds-date__caption-button {
|
||||
.navds-date__caption-button,
|
||||
.navds-date__caption-button:disabled {
|
||||
color: var(--ac-date-caption-text, var(--a-text-default));
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.navds-fieldset__legend {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.navds-fieldset:disabled > .navds-fieldset__legend,
|
||||
.navds-fieldset:disabled > .navds-fieldset__description {
|
||||
opacity: 0.3;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@charset "UTF-8";
|
||||
@import "baseline/baseline.css";
|
||||
@import "baseline/index.css";
|
||||
@import "typography.css";
|
||||
@import "grid.css";
|
||||
@import "accordion.css";
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-css",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "CSS for NAV Designsystem",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"keywords": [
|
||||
@@ -8,23 +8,40 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"files": [
|
||||
"*",
|
||||
"!dist/version",
|
||||
"!config/bundle.js"
|
||||
],
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/navikt/aksel.git"
|
||||
},
|
||||
"main": "./dist/index.css",
|
||||
"scripts": {
|
||||
"build": "postcss --use postcss-import postcss-combine-duplicated-selectors -o dist/index.css index.css",
|
||||
"watch": "postcss --watch --use postcss-import -o dist/index.css index.css"
|
||||
"build": "node config/bundle.js",
|
||||
"watch": "nodemon --ignore dist -e css --watch . --exec \"yarn build\"",
|
||||
"css:get-version": "node config/get-version.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@navikt/ds-tokens": "^2.8.13",
|
||||
"@navikt/ds-tokens": "^2.9.2",
|
||||
"cssnano": "6.0.0",
|
||||
"fast-glob": "3.2.11",
|
||||
"lodash": "4.17.21",
|
||||
"nodemon": "^2.0.12",
|
||||
"normalize.css": "^8.0.1",
|
||||
"postcss": "^8.4.0",
|
||||
"postcss-cli": "^9.0.0",
|
||||
"postcss-combine-duplicated-selectors": "10.0.3",
|
||||
"postcss-import": "^14.1.0"
|
||||
}
|
||||
},
|
||||
"browserslist": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not ie <= 11",
|
||||
"not op_mini all"
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,3 @@
|
||||
[data-theme="dark"] {
|
||||
--ac-typo-error-text: var(--a-red-300);
|
||||
}
|
||||
|
||||
/* Heading */
|
||||
.navds-heading {
|
||||
font-weight: var(--a-font-weight-bold);
|
||||
@@ -186,6 +182,11 @@
|
||||
margin-bottom: var(--a-spacing-2);
|
||||
}
|
||||
|
||||
[data-theme="dark"].navds-error-message,
|
||||
[data-theme="dark"] .navds-error-message {
|
||||
--a-text-danger: var(--a-red-300);
|
||||
}
|
||||
|
||||
.navds-error-message {
|
||||
color: var(--ac-typo-error-text, var(--a-text-danger));
|
||||
}
|
||||
@@ -1,5 +1,63 @@
|
||||
# @navikt/ds-react
|
||||
|
||||
## 2.9.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/aksel-icons@2.9.2
|
||||
- @navikt/ds-icons@2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1944](https://github.com/navikt/aksel/pull/1944) [`1afdee453`](https://github.com/navikt/aksel/commit/1afdee453fbba20ec280dc868c8aa1ae2a92132d) Thanks [@KenAJoh](https://github.com/KenAJoh)! - ExpansionCard støtter nå aria-labelledby
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/aksel-icons@2.9.1
|
||||
- @navikt/ds-icons@2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/aksel-icons@2.9.0
|
||||
- @navikt/ds-icons@2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [`ff001f2bc`](https://github.com/navikt/aksel/commit/ff001f2bcf5a1ff0580660a1680f4f8342e7fdff) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :bug: ExpansionCard.Content sendte ikke className videre
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/aksel-icons@2.8.16
|
||||
- @navikt/ds-icons@2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
- [#1929](https://github.com/navikt/aksel/pull/1929) [`284534246`](https://github.com/navikt/aksel/commit/28453424684e00d65fd8d204f1405f7ed6a82fbf) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Bedre håndtering av visning for out-of-range dates i datepickers
|
||||
|
||||
- Updated dependencies [[`dfe923582`](https://github.com/navikt/aksel/commit/dfe923582a57b41c77cfb4fbfa7c56be047ef2b0), [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865)]:
|
||||
- @navikt/aksel-icons@2.8.15
|
||||
- @navikt/ds-icons@2.8.15
|
||||
|
||||
## 2.8.14
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [`f0d9a8853`](https://github.com/navikt/aksel/commit/f0d9a8853f56854a4049bd3f6cc34968e9d6c380) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Fixes shown month on open in Datepicker/MonthPicker, better handling of out-of-range 'today'
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/aksel-icons@2.8.14
|
||||
- @navikt/ds-icons@2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-react",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Aksel react-components for NAV designsystem",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"license": "MIT",
|
||||
@@ -18,7 +18,8 @@
|
||||
"module": "./esm/index.js",
|
||||
"typings": "./esm/index.d.ts",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"files": [
|
||||
"/cjs",
|
||||
@@ -37,8 +38,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@floating-ui/react": "0.17.0",
|
||||
"@navikt/aksel-icons": "^2.8.13",
|
||||
"@navikt/ds-icons": "^2.8.13",
|
||||
"@navikt/aksel-icons": "^2.9.2",
|
||||
"@navikt/ds-icons": "^2.9.2",
|
||||
"@radix-ui/react-tabs": "1.0.0",
|
||||
"@radix-ui/react-toggle-group": "1.0.0",
|
||||
"clsx": "^1.2.1",
|
||||
|
||||
@@ -7,6 +7,7 @@ import { CaptionProps, useDayPicker, useNavigation } from "react-day-picker";
|
||||
import { Button, Select } from "../../..";
|
||||
import { getMonths, getYears } from "../../utils/get-dates";
|
||||
import { labelMonthDropdown, labelYearDropdown } from "../../utils/labels";
|
||||
import { max, min } from "date-fns";
|
||||
|
||||
export const DropdownCaption = ({ displayMonth, id }: CaptionProps) => {
|
||||
const { goToMonth, nextMonth, previousMonth } = useNavigation();
|
||||
@@ -23,13 +24,18 @@ export const DropdownCaption = ({ displayMonth, id }: CaptionProps) => {
|
||||
return null;
|
||||
}
|
||||
|
||||
const handleYearChange: React.ChangeEventHandler<HTMLSelectElement> = (e) =>
|
||||
goToMonth(setYear(startOfMonth(displayMonth), Number(e.target.value)));
|
||||
const handleYearChange: React.ChangeEventHandler<HTMLSelectElement> = (e) => {
|
||||
const newMonth = setYear(
|
||||
startOfMonth(displayMonth),
|
||||
Number(e.target.value)
|
||||
);
|
||||
goToMonth(startOfMonth(min([max([newMonth, fromDate]), toDate])));
|
||||
};
|
||||
|
||||
const handleMonthChange: React.ChangeEventHandler<HTMLSelectElement> = (e) =>
|
||||
goToMonth(setMonth(startOfMonth(displayMonth), Number(e.target.value)));
|
||||
|
||||
const years = getYears(fromDate, toDate);
|
||||
const years = getYears(fromDate, toDate, displayMonth.getFullYear());
|
||||
const months = getMonths(fromDate, toDate, displayMonth);
|
||||
|
||||
const previousLabel = labelPrevious(previousMonth, { locale });
|
||||
|
||||
@@ -149,14 +149,13 @@ export const ShowWeekNumber = () => (
|
||||
export const UseDatepicker = () => {
|
||||
const { datepickerProps, inputProps } = UNSAFE_useDatepicker({
|
||||
fromDate: new Date("Aug 23 2019"),
|
||||
toDate: new Date("Feb 23 2024"),
|
||||
onDateChange: console.log,
|
||||
locale: "en",
|
||||
openOnFocus: false,
|
||||
});
|
||||
|
||||
return (
|
||||
<div style={{ display: "flex", gap: "1rem" }}>
|
||||
<DatePicker {...datepickerProps}>
|
||||
<DatePicker {...datepickerProps} dropdownCaption>
|
||||
<DatePicker.Input {...inputProps} label="Velg dato" />
|
||||
</DatePicker>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import differenceInCalendarDays from "date-fns/differenceInCalendarDays";
|
||||
import isWeekend from "date-fns/isWeekend";
|
||||
import React, { useRef, useState } from "react";
|
||||
import React, { useCallback, useRef, useState } from "react";
|
||||
import { DayClickEventHandler, isMatch } from "react-day-picker";
|
||||
import { DateInputProps } from "../DateInput";
|
||||
import { DatePickerProps } from "../datepicker/DatePicker";
|
||||
@@ -150,13 +150,22 @@ export const useDatepicker = (
|
||||
: "";
|
||||
const [inputValue, setInputValue] = useState(defaultInputValue);
|
||||
|
||||
useOutsideClickHandler(open, setOpen, [
|
||||
const handleOpen = useCallback(
|
||||
(open: boolean) => {
|
||||
setOpen(open);
|
||||
!open &&
|
||||
setMonth(selectedDay ?? defaultSelected ?? defaultMonth ?? today);
|
||||
},
|
||||
[defaultMonth, defaultSelected, selectedDay, today]
|
||||
);
|
||||
|
||||
useOutsideClickHandler(open, handleOpen, [
|
||||
daypickerRef,
|
||||
inputRef.current,
|
||||
inputRef.current?.nextSibling,
|
||||
]);
|
||||
|
||||
useEscape(open, setOpen, inputRef);
|
||||
useEscape(open, handleOpen, inputRef);
|
||||
|
||||
const updateDate = (date?: Date) => {
|
||||
onDateChange?.(date);
|
||||
@@ -182,7 +191,7 @@ export const useDatepicker = (
|
||||
};
|
||||
|
||||
const handleFocus: React.FocusEventHandler<HTMLInputElement> = (e) => {
|
||||
!open && openOnFocus && setOpen(true);
|
||||
!open && openOnFocus && handleOpen(true);
|
||||
let day = parseDate(
|
||||
e.target.value,
|
||||
today,
|
||||
@@ -191,8 +200,14 @@ export const useDatepicker = (
|
||||
allowTwoDigitYear
|
||||
);
|
||||
if (isValidDate(day)) {
|
||||
setMonth(day);
|
||||
setInputValue(formatDateForInput(day, locale, "date", inputFormat));
|
||||
|
||||
const isBefore =
|
||||
fromDate && day && differenceInCalendarDays(fromDate, day) > 0;
|
||||
const isAfter =
|
||||
toDate && day && differenceInCalendarDays(day, toDate) > 0;
|
||||
|
||||
!isBefore && !isAfter && setMonth(day);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -211,7 +226,7 @@ export const useDatepicker = (
|
||||
/* Only allow de-selecting if not required */
|
||||
const handleDayClick: DayClickEventHandler = (day, { selected }) => {
|
||||
if (day && !selected) {
|
||||
setOpen(false);
|
||||
handleOpen(false);
|
||||
inputRef.current && inputRef.current.focus();
|
||||
}
|
||||
|
||||
@@ -288,7 +303,7 @@ export const useDatepicker = (
|
||||
toDate,
|
||||
today,
|
||||
open,
|
||||
onOpenToggle: () => setOpen((x) => !x),
|
||||
onOpenToggle: () => handleOpen(!open),
|
||||
disabled,
|
||||
disableWeekends,
|
||||
ref: setDaypickerRef,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import React, { useCallback, useEffect } from "react";
|
||||
import { useCallback, useEffect } from "react";
|
||||
|
||||
export const useEscape = (
|
||||
open: boolean,
|
||||
setOpen: React.Dispatch<React.SetStateAction<boolean>>,
|
||||
setOpen: (openState: boolean) => void,
|
||||
focusRef: any
|
||||
) => {
|
||||
const handleClose = useCallback(() => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useRef, useState } from "react";
|
||||
import React, { useCallback, useMemo, useRef, useState } from "react";
|
||||
import { DateInputProps } from "../DateInput";
|
||||
import { MonthPickerProps } from "../monthpicker/MonthPicker";
|
||||
import {
|
||||
@@ -96,6 +96,20 @@ const getValidationMessage = (val = {}): MonthValidationT => ({
|
||||
...val,
|
||||
});
|
||||
|
||||
const getIsBefore = (opt: { fromDate?: Date; date?: Date }) =>
|
||||
opt.fromDate &&
|
||||
opt.date &&
|
||||
(opt.fromDate.getFullYear() > opt.date.getFullYear() ||
|
||||
(opt.fromDate.getFullYear() === opt.date.getFullYear() &&
|
||||
opt.fromDate.getMonth() > opt.date.getMonth()));
|
||||
|
||||
const getIsAfter = (opt: { toDate?: Date; date?: Date }) =>
|
||||
opt.toDate &&
|
||||
opt.date &&
|
||||
(opt.toDate.getFullYear() < opt.date.getFullYear() ||
|
||||
(opt.toDate.getFullYear() === opt.date.getFullYear() &&
|
||||
opt.toDate.getMonth() < opt.date.getMonth()));
|
||||
|
||||
export const useMonthpicker = (
|
||||
opt: UseMonthPickerOptions = {}
|
||||
): UseMonthPickerValue => {
|
||||
@@ -116,7 +130,7 @@ export const useMonthpicker = (
|
||||
|
||||
const [defaultSelected, setDefaultSelected] = useState(_defaultSelected);
|
||||
|
||||
const today = new Date();
|
||||
const today = useMemo(() => new Date(), []);
|
||||
const locale = getLocaleFromString(_locale);
|
||||
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
@@ -133,13 +147,22 @@ export const useMonthpicker = (
|
||||
|
||||
const [inputValue, setInputValue] = useState(defaultInputValue);
|
||||
|
||||
useOutsideClickHandler(open, setOpen, [
|
||||
const handleOpen = useCallback(
|
||||
(open: boolean) => {
|
||||
setOpen(open);
|
||||
!open &&
|
||||
setYear(selectedMonth ?? defaultSelected ?? defaultYear ?? today);
|
||||
},
|
||||
[defaultSelected, defaultYear, selectedMonth, today]
|
||||
);
|
||||
|
||||
useOutsideClickHandler(open, handleOpen, [
|
||||
monthpickerRef,
|
||||
inputRef.current,
|
||||
inputRef.current?.nextSibling,
|
||||
]);
|
||||
|
||||
useEscape(open, setOpen, inputRef);
|
||||
useEscape(open, handleOpen, inputRef);
|
||||
|
||||
const updateMonth = (date?: Date) => {
|
||||
onMonthChange?.(date);
|
||||
@@ -165,7 +188,7 @@ export const useMonthpicker = (
|
||||
};
|
||||
|
||||
const handleFocus: React.FocusEventHandler<HTMLInputElement> = (e) => {
|
||||
!open && openOnFocus && setOpen(true);
|
||||
!open && openOnFocus && handleOpen(true);
|
||||
let day = parseDate(
|
||||
e.target.value,
|
||||
today,
|
||||
@@ -173,8 +196,11 @@ export const useMonthpicker = (
|
||||
"month",
|
||||
allowTwoDigitYear
|
||||
);
|
||||
const isBefore = getIsBefore({ fromDate, date: day });
|
||||
const isAfter = getIsAfter({ toDate, date: day });
|
||||
|
||||
if (isValidDate(day)) {
|
||||
setYear(day);
|
||||
!isBefore && !isAfter && setYear(day);
|
||||
setInputValue(formatDateForInput(day, locale, "month", inputFormat));
|
||||
} else {
|
||||
setYear(defaultSelected ?? defaultYear ?? today);
|
||||
@@ -196,7 +222,7 @@ export const useMonthpicker = (
|
||||
/* Only allow de-selecting if not required */
|
||||
const handleMonthClick = (month?: Date) => {
|
||||
if (month) {
|
||||
setOpen(false);
|
||||
handleOpen(false);
|
||||
inputRef.current && inputRef.current.focus();
|
||||
setYear(month);
|
||||
}
|
||||
@@ -228,19 +254,8 @@ export const useMonthpicker = (
|
||||
allowTwoDigitYear
|
||||
);
|
||||
|
||||
const isBefore =
|
||||
fromDate &&
|
||||
month &&
|
||||
(fromDate.getFullYear() > month.getFullYear() ||
|
||||
(fromDate.getFullYear() === month.getFullYear() &&
|
||||
fromDate.getMonth() > month.getMonth()));
|
||||
|
||||
const isAfter =
|
||||
toDate &&
|
||||
month &&
|
||||
(toDate.getFullYear() < month.getFullYear() ||
|
||||
(toDate.getFullYear() === month.getFullYear() &&
|
||||
toDate.getMonth() < month.getMonth()));
|
||||
const isBefore = getIsBefore({ fromDate, date: month });
|
||||
const isAfter = getIsAfter({ toDate, date: month });
|
||||
|
||||
if (!isValidDate(month) || (disabled && isMatch(month, disabled))) {
|
||||
updateMonth(undefined);
|
||||
@@ -282,7 +297,7 @@ export const useMonthpicker = (
|
||||
fromDate,
|
||||
toDate,
|
||||
open,
|
||||
onOpenToggle: () => setOpen((x) => !x),
|
||||
onOpenToggle: () => handleOpen(!open),
|
||||
disabled,
|
||||
ref: setMonthpickerRef,
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import React, { useCallback, useEffect } from "react";
|
||||
import { useCallback, useEffect } from "react";
|
||||
|
||||
export const useOutsideClickHandler = (
|
||||
open: boolean,
|
||||
setOpen: React.Dispatch<React.SetStateAction<boolean>>,
|
||||
setOpen: (openState: boolean) => void,
|
||||
refs: Array<any>
|
||||
) => {
|
||||
const handleFocusIn = useCallback(
|
||||
|
||||
@@ -318,12 +318,18 @@ export const useRangeDatepicker = (
|
||||
allowTwoDigitYear
|
||||
);
|
||||
if (isValidDate(day)) {
|
||||
setMonth(day);
|
||||
src === RANGE.FROM
|
||||
? setFromInputValue(
|
||||
formatDateForInput(day, locale, "date", inputFormat)
|
||||
)
|
||||
: setToInputValue(formatDateForInput(day, locale, "date", inputFormat));
|
||||
|
||||
const isBefore =
|
||||
fromDate && day && differenceInCalendarDays(fromDate, day) > 0;
|
||||
const isAfter =
|
||||
toDate && day && differenceInCalendarDays(day, toDate) > 0;
|
||||
|
||||
!isBefore && !isAfter && setMonth(day);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Left, Right } from "@navikt/ds-icons";
|
||||
import isSameYear from "date-fns/isSameYear";
|
||||
import setYear from "date-fns/setYear";
|
||||
import startOfMonth from "date-fns/startOfMonth";
|
||||
import startOfYear from "date-fns/startOfYear";
|
||||
@@ -7,7 +6,8 @@ import React from "react";
|
||||
import { useDayPicker } from "react-day-picker";
|
||||
import { Button, Select } from "../..";
|
||||
import { useSharedMonthContext } from "../context";
|
||||
import { hasNextYear, labelNextYear, labelPrevYear } from "../utils";
|
||||
import { labelNextYear, labelPrevYear } from "../utils";
|
||||
import { isAfter, isBefore } from "date-fns";
|
||||
|
||||
export const MonthCaption = () => {
|
||||
const {
|
||||
@@ -27,34 +27,38 @@ export const MonthCaption = () => {
|
||||
for (let year = fromYear; year <= toYear; year++) {
|
||||
years.push(setYear(startOfYear(new Date()), year));
|
||||
}
|
||||
|
||||
if (!years.map((x) => x.getFullYear()).includes(year.getFullYear())) {
|
||||
years.push(setYear(startOfYear(new Date()), year.getFullYear()));
|
||||
}
|
||||
years.sort((a, b) => a.getFullYear() - b.getFullYear());
|
||||
}
|
||||
|
||||
const handleYearChange = (e) =>
|
||||
toYear(setYear(startOfMonth(new Date()), Number(e.target.value)));
|
||||
|
||||
const handleButtonClick = (val: number) => {
|
||||
let newMonth: Date;
|
||||
if (hasDropdown && hasNextYear(year, years, val)) {
|
||||
newMonth = setYear(new Date(), year.getFullYear() + val);
|
||||
toYear(newMonth);
|
||||
} else if (!hasDropdown) {
|
||||
const newYear = Number(year.getFullYear() + val);
|
||||
newMonth = setYear(year, newYear);
|
||||
toYear(newMonth);
|
||||
}
|
||||
const newYear = Number(year.getFullYear() + val);
|
||||
toYear(setYear(year, newYear));
|
||||
};
|
||||
|
||||
const hasFollowingYear = (value: number) => {
|
||||
return years.some((y) =>
|
||||
isSameYear(y, setYear(year, Number(year.getFullYear() + value)))
|
||||
);
|
||||
const hasPrevYear = () => {
|
||||
return fromDate
|
||||
? isBefore(year?.getFullYear() - 1, fromDate?.getFullYear())
|
||||
: true;
|
||||
};
|
||||
|
||||
const hasNextYear = () => {
|
||||
return toDate
|
||||
? isAfter(year?.getFullYear() + 1, toDate?.getFullYear())
|
||||
: true;
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="navds-date__caption">
|
||||
<Button
|
||||
className="navds-date__caption-button"
|
||||
disabled={!hasDropdown ? false : !hasFollowingYear(-1)}
|
||||
disabled={hasPrevYear()}
|
||||
onClick={() => handleButtonClick(-1)}
|
||||
aria-label={labelPrevYear(locale?.code)}
|
||||
icon={<Left aria-hidden />}
|
||||
@@ -83,7 +87,7 @@ export const MonthCaption = () => {
|
||||
)}
|
||||
<Button
|
||||
className="navds-date__caption-button"
|
||||
disabled={!hasDropdown ? false : !hasFollowingYear(1)}
|
||||
disabled={hasNextYear()}
|
||||
onClick={() => handleButtonClick(1)}
|
||||
aria-label={labelNextYear(locale?.code)}
|
||||
icon={<Right aria-hidden />}
|
||||
|
||||
@@ -77,11 +77,13 @@ export const UseMonthpicker = () => {
|
||||
const { inputProps, monthpickerProps } = UNSAFE_useMonthpicker({
|
||||
disabled: [new Date("Apr 1 2022")],
|
||||
onMonthChange: console.log,
|
||||
fromDate: new Date("Jan 1 2022"),
|
||||
toDate: new Date("Sep 27 2025"),
|
||||
});
|
||||
|
||||
return (
|
||||
<div style={{ height: "20rem" }}>
|
||||
<MonthPicker {...monthpickerProps}>
|
||||
<MonthPicker {...monthpickerProps} dropdownCaption>
|
||||
<MonthPicker.Input
|
||||
{...inputProps}
|
||||
label="Velg måned"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { dateIsInCurrentMonth, hasNextYear } from "..";
|
||||
import { dateIsInCurrentMonth } from "..";
|
||||
|
||||
const selectedDate = new Date("Feb 1 1994");
|
||||
|
||||
@@ -19,29 +19,3 @@ describe("Returns if date is in current month", () => {
|
||||
).toBeFalsy();
|
||||
});
|
||||
});
|
||||
|
||||
const years = [
|
||||
new Date(),
|
||||
new Date("Aug 5 2023"),
|
||||
new Date("Aug 5 2024"),
|
||||
new Date("Aug 5 2025"),
|
||||
new Date("Aug 5 2026"),
|
||||
new Date("Aug 5 2027"),
|
||||
new Date("Aug 5 2028"),
|
||||
new Date("Aug 5 2029"),
|
||||
];
|
||||
|
||||
describe("Returns if year is at start or end of range", () => {
|
||||
test("Should have next year (true)", () => {
|
||||
expect(hasNextYear(new Date(), years, 1)).toBeTruthy();
|
||||
});
|
||||
test("Should have previous year (true)", () => {
|
||||
expect(hasNextYear(new Date("Aug 3 2024"), years, -1)).toBeTruthy();
|
||||
});
|
||||
test("Should not have next year (false)", () => {
|
||||
expect(hasNextYear(new Date("Aug 3 2029"), years, 1)).toBeFalsy();
|
||||
});
|
||||
test("Should not have previous year (false)", () => {
|
||||
expect(hasNextYear(new Date(), years, -1)).toBeFalsy();
|
||||
});
|
||||
});
|
||||
@@ -57,6 +57,25 @@ describe("Extracts correct months", () => {
|
||||
};
|
||||
expect(getMonths(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
test("End part of 2022, including starting month (12)", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 5, 22),
|
||||
end: new Date(2022, 7, 22),
|
||||
current: new Date(2022, 7, 22),
|
||||
res: 8,
|
||||
};
|
||||
expect(getMonths(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
test("Adds out of range month to list (13)", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 5, 22),
|
||||
end: new Date(2022, 7, 22),
|
||||
current: new Date(2022, 9, 22),
|
||||
res: 9,
|
||||
};
|
||||
console.log(getMonths(t.start, t.end, t.current));
|
||||
expect(getMonths(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
});
|
||||
|
||||
describe("Extracts correct years", () => {
|
||||
@@ -64,16 +83,39 @@ describe("Extracts correct years", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 2, 22),
|
||||
end: new Date(2019, 9, 22),
|
||||
current: 2019,
|
||||
res: 1,
|
||||
};
|
||||
expect(getYears(t.start, t.end).length).toEqual(t.res);
|
||||
expect(getYears(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
|
||||
test("Multiple years (11)", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 2, 22),
|
||||
end: new Date(2029, 9, 22),
|
||||
current: 2022,
|
||||
res: 11,
|
||||
};
|
||||
expect(getYears(t.start, t.end).length).toEqual(t.res);
|
||||
expect(getYears(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
|
||||
test("Displaymonth outside range: after (11)", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 2, 22),
|
||||
end: new Date(2029, 9, 22),
|
||||
current: 2040,
|
||||
res: 12,
|
||||
};
|
||||
expect(getYears(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
|
||||
test("Displaymonth outside range: before (11)", () => {
|
||||
const t = {
|
||||
start: new Date(2019, 2, 22),
|
||||
end: new Date(2029, 9, 22),
|
||||
current: 2001,
|
||||
res: 12,
|
||||
};
|
||||
expect(getYears(t.start, t.end, t.current).length).toEqual(t.res);
|
||||
});
|
||||
});
|
||||
@@ -12,7 +12,3 @@ export const dateIsInCurrentMonth = (
|
||||
export function isValidDate(day: Date): boolean {
|
||||
return day && !isNaN(day?.getTime()) && day.getFullYear() > 999;
|
||||
}
|
||||
|
||||
export const hasNextYear = (year: Date, years: Date[], val: any): boolean => {
|
||||
return years.some((x) => year.getFullYear() + val === x.getFullYear());
|
||||
};
|
||||
@@ -28,15 +28,31 @@ export const getMonths = (start: Date, end: Date, current: Date): Date[] => {
|
||||
dropdownMonths.push(setMonth(date, month));
|
||||
}
|
||||
}
|
||||
|
||||
if (!dropdownMonths.map((d) => d.getMonth()).includes(current.getMonth())) {
|
||||
dropdownMonths.push(current);
|
||||
}
|
||||
dropdownMonths.sort((a, b) => a.getMonth() - b.getMonth());
|
||||
|
||||
return dropdownMonths;
|
||||
};
|
||||
|
||||
export const getYears = (start: Date, end: Date): Date[] => {
|
||||
export const getYears = (
|
||||
start: Date,
|
||||
end: Date,
|
||||
currentYear: number
|
||||
): Date[] => {
|
||||
const years: Date[] = [];
|
||||
const fromYear = start.getFullYear();
|
||||
const toYear = end.getFullYear();
|
||||
for (let year = fromYear; year <= toYear; year++) {
|
||||
years.push(setYear(startOfYear(new Date()), year));
|
||||
}
|
||||
|
||||
if (fromYear > currentYear || toYear < currentYear) {
|
||||
years.push(setYear(startOfYear(new Date()), currentYear));
|
||||
}
|
||||
|
||||
years.sort((a, b) => a.getFullYear() - b.getFullYear());
|
||||
return years;
|
||||
};
|
||||
@@ -15,7 +15,7 @@ export {
|
||||
export { getLocaleFromString } from "./locale";
|
||||
export { disableDate } from "./dates-disabled";
|
||||
|
||||
export { dateIsInCurrentMonth, isValidDate, hasNextYear } from "./check-dates";
|
||||
export { dateIsInCurrentMonth, isValidDate } from "./check-dates";
|
||||
export { getInitialYear } from "./get-initial-year";
|
||||
export { isMatch, isDateInRange, type Matcher } from "./is-match";
|
||||
export { nextEnabled } from "./navigation";
|
||||
@@ -25,7 +25,7 @@ interface ExpansionCardComponent
|
||||
Content: ExpansionCardContentType;
|
||||
}
|
||||
|
||||
export interface ExpansionCardProps
|
||||
interface ExpansionCardCommonProps
|
||||
extends React.HTMLAttributes<HTMLDivElement> {
|
||||
children: React.ReactNode;
|
||||
/**
|
||||
@@ -49,9 +49,16 @@ export interface ExpansionCardProps
|
||||
/**
|
||||
* Since ExpansionCard is a section-element, accessible name is required.
|
||||
*/
|
||||
["aria-label"]: string;
|
||||
}
|
||||
|
||||
type ExpansionCardConditionalProps =
|
||||
| {
|
||||
["aria-label"]: string;
|
||||
}
|
||||
| {
|
||||
["aria-labelledby"]: string;
|
||||
};
|
||||
|
||||
export type ExpansionCardContextProps = {
|
||||
open: boolean;
|
||||
toggleOpen: () => void;
|
||||
@@ -64,6 +71,9 @@ export const ExpansionCardContext = createContext<ExpansionCardContextProps>({
|
||||
size: "medium",
|
||||
});
|
||||
|
||||
export type ExpansionCardProps = ExpansionCardCommonProps &
|
||||
ExpansionCardConditionalProps;
|
||||
|
||||
export const ExpansionCard = forwardRef<HTMLDivElement, ExpansionCardProps>(
|
||||
(
|
||||
{
|
||||
|
||||
@@ -28,7 +28,7 @@ const ExpansionCardContent: ExpansionCardContentType = forwardRef(
|
||||
{...rest}
|
||||
ref={ref}
|
||||
as="div"
|
||||
className={cl("navds-expansioncard__content", {
|
||||
className={cl("navds-expansioncard__content", className, {
|
||||
"navds-expansioncard__content--closed": !panelContext.open,
|
||||
})}
|
||||
aria-hidden={!panelContext.open}
|
||||
|
||||
@@ -13,7 +13,7 @@ export interface TextareaProps
|
||||
React.TextareaHTMLAttributes<HTMLTextAreaElement> {
|
||||
/**
|
||||
* Allowed character-count for content
|
||||
* @note This is just a visual validator, you need to set actual character-limits if needed
|
||||
* @note This is just a visual indicator! You will need to handle actual character-limits/validation if needed
|
||||
*/
|
||||
maxLength?: number;
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,21 @@
|
||||
# @navikt/ds-tailwind
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-tailwind",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Tailwind config based on @navikt/ds-tokens",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"keywords": [
|
||||
@@ -22,7 +22,7 @@
|
||||
"directory": "@navikt/core/tailwind"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@navikt/ds-tokens": "^2.8.13",
|
||||
"@navikt/ds-tokens": "^2.9.2",
|
||||
"@types/jest": "^29.0.0",
|
||||
"color": "4.2.3",
|
||||
"jest": "^29.0.0",
|
||||
@@ -30,5 +30,9 @@
|
||||
"ts-jest": "^29.0.0",
|
||||
"ts-node": "10.9.0",
|
||||
"typescript": "^4.8.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,21 @@
|
||||
# @navikt/ds-tokens
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-tokens",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Design-tokens for NAV designsystem",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"keywords": [
|
||||
@@ -38,5 +38,9 @@
|
||||
"ts-jest": "^29.0.0",
|
||||
"ts-node": "10.9.0",
|
||||
"typescript": "^4.8.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,21 @@
|
||||
# @navikt/ds-icons
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-icons",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Aksel icons for NAV",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"repository": {
|
||||
@@ -50,7 +50,7 @@
|
||||
"@types/jest": "^29.0.0",
|
||||
"@types/lodash.startcase": "^4.4.6",
|
||||
"@types/rimraf": "3.0.2",
|
||||
"axios": "^0.21.3",
|
||||
"axios": "1.3.6",
|
||||
"concurrently": "7.2.1",
|
||||
"copyfiles": "^2.4.1",
|
||||
"dotenv": "^10.0.0",
|
||||
@@ -62,5 +62,9 @@
|
||||
"ts-jest": "^29.0.0",
|
||||
"ts-node": "10.9.0",
|
||||
"typescript": "^4.8.0"
|
||||
},
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,21 @@
|
||||
# @navikt/ds-css-internal
|
||||
|
||||
## 2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
## 2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
## 2.8.12
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-css-internal",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "CSS for NAV internal Designsystem-components",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"keywords": [
|
||||
@@ -8,7 +8,8 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
@@ -1,5 +1,57 @@
|
||||
# @navikt/ds-react-internal
|
||||
|
||||
## 2.9.2
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1948](https://github.com/navikt/aksel/pull/1948) [`b1e18fd72`](https://github.com/navikt/aksel/commit/b1e18fd7249105f18354952b8f64d37108b4d730) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :bug: Timeline bruker nå norsk locale for Labels
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/ds-react@2.9.2
|
||||
- @navikt/ds-icons@2.9.2
|
||||
|
||||
## 2.9.1
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [[`1afdee453`](https://github.com/navikt/aksel/commit/1afdee453fbba20ec280dc868c8aa1ae2a92132d)]:
|
||||
- @navikt/ds-react@2.9.1
|
||||
- @navikt/ds-icons@2.9.1
|
||||
|
||||
## 2.9.0
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies []:
|
||||
- @navikt/ds-react@2.9.0
|
||||
- @navikt/ds-icons@2.9.0
|
||||
|
||||
## 2.8.16
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [[`ff001f2bc`](https://github.com/navikt/aksel/commit/ff001f2bcf5a1ff0580660a1680f4f8342e7fdff)]:
|
||||
- @navikt/ds-react@2.8.16
|
||||
- @navikt/ds-icons@2.8.16
|
||||
|
||||
## 2.8.15
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- [#1930](https://github.com/navikt/aksel/pull/1930) [`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Alle pakker implementerer nå npm provenance (beta)
|
||||
|
||||
- Updated dependencies [[`6682be1c8`](https://github.com/navikt/aksel/commit/6682be1c8e6562213c64e5be4bed70fef54ab865), [`284534246`](https://github.com/navikt/aksel/commit/28453424684e00d65fd8d204f1405f7ed6a82fbf)]:
|
||||
- @navikt/ds-react@2.8.15
|
||||
- @navikt/ds-icons@2.8.15
|
||||
|
||||
## 2.8.14
|
||||
|
||||
### Patch Changes
|
||||
|
||||
- Updated dependencies [[`f0d9a8853`](https://github.com/navikt/aksel/commit/f0d9a8853f56854a4049bd3f6cc34968e9d6c380)]:
|
||||
- @navikt/ds-react@2.8.14
|
||||
- @navikt/ds-icons@2.8.14
|
||||
|
||||
## 2.8.13
|
||||
|
||||
### Patch Changes
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@navikt/ds-react-internal",
|
||||
"version": "2.8.13",
|
||||
"version": "2.9.2",
|
||||
"description": "Aksel react components for internal UIs in NAV",
|
||||
"author": "Aksel | NAV designsystem team",
|
||||
"license": "MIT",
|
||||
@@ -18,7 +18,8 @@
|
||||
"module": "./esm/index.js",
|
||||
"typings": "./esm/index.d.ts",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
"access": "public",
|
||||
"provenance": true
|
||||
},
|
||||
"files": [
|
||||
"/cjs",
|
||||
@@ -35,8 +36,8 @@
|
||||
"watch": "tsc --watch -p tsconfig.esm.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@navikt/ds-icons": "^2.8.13",
|
||||
"@navikt/ds-react": "^2.8.13",
|
||||
"@navikt/ds-icons": "^2.9.2",
|
||||
"@navikt/ds-react": "^2.9.2",
|
||||
"clsx": "^1.1.1",
|
||||
"copy-to-clipboard": "^3.3.1"
|
||||
},
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
startOfYear,
|
||||
subDays,
|
||||
} from "date-fns";
|
||||
import nbLocale from "date-fns/locale/nb";
|
||||
import React from "react";
|
||||
import { useTimelineContext } from "./hooks/useTimelineContext";
|
||||
import { isVisible } from "./utils";
|
||||
@@ -42,7 +43,7 @@ export const dayLabels = (
|
||||
return {
|
||||
direction: direction,
|
||||
horizontalPosition: horizontalPosition,
|
||||
label: format(day, "MM.dd"),
|
||||
label: format(day, "dd.MM", { locale: nbLocale }),
|
||||
date: day,
|
||||
width: width,
|
||||
};
|
||||
@@ -69,7 +70,7 @@ export const monthLabels = (
|
||||
return {
|
||||
direction: direction,
|
||||
horizontalPosition: horizontalPosition,
|
||||
label: format(month, "MMM yy"),
|
||||
label: format(month, "MMM yy", { locale: nbLocale }),
|
||||
date: month,
|
||||
width: width,
|
||||
};
|
||||
|
||||
@@ -15,15 +15,15 @@
|
||||
"website"
|
||||
],
|
||||
"dependencies": {
|
||||
"@navikt/aksel-icons": "^2.8.13",
|
||||
"@navikt/ds-codemod": "^2.8.13",
|
||||
"@navikt/ds-css": "^2.8.13",
|
||||
"@navikt/ds-css-internal": "^2.8.13",
|
||||
"@navikt/ds-icons": "^2.8.13",
|
||||
"@navikt/ds-react": "^2.8.13",
|
||||
"@navikt/ds-react-internal": "^2.8.13",
|
||||
"@navikt/ds-tailwind": "^2.8.13",
|
||||
"@navikt/ds-tokens": "^2.8.13"
|
||||
"@navikt/aksel-icons": "^2.9.2",
|
||||
"@navikt/ds-codemod": "^2.9.2",
|
||||
"@navikt/ds-css": "^2.9.2",
|
||||
"@navikt/ds-css-internal": "^2.9.2",
|
||||
"@navikt/ds-icons": "^2.9.2",
|
||||
"@navikt/ds-react": "^2.9.2",
|
||||
"@navikt/ds-react-internal": "^2.9.2",
|
||||
"@navikt/ds-tailwind": "^2.9.2",
|
||||
"@navikt/ds-tokens": "^2.9.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"prettier-plugin-tailwindcss": "^0.2.3"
|
||||
|
||||
@@ -7,6 +7,7 @@ import { Tag } from "./Tag";
|
||||
import cl from "clsx";
|
||||
import { getImage } from "components/website-modules/utils/get-image";
|
||||
import { urlFor } from "@/sanity/interface";
|
||||
import { withErrorBoundary } from "@/error-boundary";
|
||||
|
||||
export type ArticleT = {
|
||||
_key: string;
|
||||
@@ -27,7 +28,7 @@ export type ArticleT = {
|
||||
contributors?: { title: string }[];
|
||||
};
|
||||
|
||||
export const Card = ({ article }: { article: ArticleT }) => {
|
||||
const Card = ({ article }: { article: ArticleT }) => {
|
||||
const date = article.publishedAt ? article.publishedAt : article._updatedAt;
|
||||
|
||||
const showFooter = ["aksel_artikkel", "aksel_blogg"].includes(article._type);
|
||||
@@ -117,7 +118,7 @@ export const Card = ({ article }: { article: ArticleT }) => {
|
||||
</div>
|
||||
{article.ingress ? (
|
||||
<BodyShort className="mt-2">{article.ingress}</BodyShort>
|
||||
) : article.seo.meta ? (
|
||||
) : article.seo?.meta ? (
|
||||
<BodyShort className="mt-2">{article.seo.meta}</BodyShort>
|
||||
) : null}
|
||||
{showFooter && (
|
||||
@@ -134,3 +135,5 @@ export const Card = ({ article }: { article: ArticleT }) => {
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default withErrorBoundary(Card, "FrontpageBlockCard");
|
||||
@@ -7,7 +7,7 @@ import { getImage } from "components/website-modules/utils/get-image";
|
||||
import { getAuthors } from "components/website-modules/LatestBloggs";
|
||||
import { dateStr, logNav } from "@/utils";
|
||||
import { Tag } from "./Tag";
|
||||
import { Card, ArticleT } from "./Card";
|
||||
import Card, { ArticleT } from "./Card";
|
||||
import cl from "clsx";
|
||||
import { urlFor } from "@/sanity/interface";
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ export const IconPage = ({ name }: { name: string }) => {
|
||||
id="hovedinnhold"
|
||||
className="min-h-[80vh] focus:outline-none"
|
||||
>
|
||||
<div className="mx-auto mb-40 grid w-full max-w-screen-2xl px-4 pt-20 sm:px-6">
|
||||
<div className="mx-auto grid w-full max-w-screen-2xl px-4 pb-40 pt-20 sm:px-6">
|
||||
<div>
|
||||
<div>
|
||||
<h1 className="text-deepblue-700 my-0 w-fit text-5xl font-bold">
|
||||
|
||||
@@ -14,11 +14,10 @@ const ContentSecurityPolicy = `
|
||||
img-src 'self' cdn.sanity.io https://avatars.githubusercontent.com data: ${cdnUrl};
|
||||
script-src 'self' ${cdnUrl} https://in2.taskanalytics.com/tm.js 'nonce-4e1aa203a32e' 'unsafe-eval';
|
||||
style-src 'self' ${cdnUrl} 'unsafe-inline';
|
||||
report-uri https://sentry.gc.nav.no/api/113/envelope/?sentry_key=d35bd60e413c489ca0f2fd389b4e6e5e&sentry_version=7;
|
||||
connect-src 'self' ${cdnUrl} https://raw.githubusercontent.com/navikt/ wss://hnbe3yhs.api.sanity.io cdn.sanity.io *.api.sanity.io https://amplitude.nav.no https://sentry.gc.nav.no https://in2.taskanalytics.com/03346;
|
||||
frame-ancestors localhost:3333 'self' localhost:3000 https://verktoykasse.sanity.studio/;
|
||||
connect-src 'self' ${cdnUrl} https://raw.githubusercontent.com/navikt/ wss://hnbe3yhs.api.sanity.io cdn.sanity.io *.api.sanity.io https://amplitude.nav.no https://in2.taskanalytics.com/03346;
|
||||
frame-ancestors 'self' localhost:3000;
|
||||
media-src 'self' ${cdnUrl} cdn.sanity.io;
|
||||
frame-src 'self' https://web.microsoftstream.com localhost:3000 https://aksel.dev.nav.no/ https://aksel.ekstern.dev.nav.no;
|
||||
frame-src 'self' https://web.microsoftstream.com localhost:3000 https://aksel.ekstern.dev.nav.no;
|
||||
`;
|
||||
|
||||
const securityHeaders = [
|
||||
|
||||
@@ -27,15 +27,15 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@sanity/block-content-to-react": "^3.0.0",
|
||||
"@sanity/client": "^5.4.0",
|
||||
"@sanity/client": "^5.4.2",
|
||||
"@sanity/code-input": "4.1.0",
|
||||
"@sanity/color-input": "^3.0.2",
|
||||
"@sanity/icons": "2.2.2",
|
||||
"@sanity/icons": "2.3.1",
|
||||
"@sanity/image-url": "1.0.2",
|
||||
"@sanity/preview-kit": "^1.4.0",
|
||||
"@sanity/table": "1.0.1",
|
||||
"@sanity/ui": "^1.3.1",
|
||||
"@sanity/vision": "3.8.3",
|
||||
"@sanity/ui": "^1.3.2",
|
||||
"@sanity/vision": "3.9.1",
|
||||
"@svgr/webpack": "^5.5.0",
|
||||
"amplitude-js": "^8.21.5",
|
||||
"boring-avatars": "1.7.0",
|
||||
@@ -54,7 +54,7 @@
|
||||
"react-modal": "3.15.1",
|
||||
"react-responsive-masonry": "^2.1.7",
|
||||
"recharts": "^2.2.0",
|
||||
"sanity": "3.8.3",
|
||||
"sanity": "3.9.1",
|
||||
"sanity-plugin-asset-source-unsplash": "^1.0.6",
|
||||
"sanity-plugin-iframe-pane": "^2.3.0",
|
||||
"sanity-plugin-media": "^2.0.5",
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@navikt/ds-css": "2.8.13",
|
||||
"@navikt/ds-react": "2.8.13",
|
||||
"@navikt/ds-css": "2.9.2",
|
||||
"@navikt/ds-react": "2.9.2",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0"
|
||||
},
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
"@navikt/codemod",
|
||||
"@navikt/icons",
|
||||
"@navikt/aksel-icons",
|
||||
"@navikt/aksel",
|
||||
"@navikt/community/*",
|
||||
"examples/*",
|
||||
"aksel.nav.no"
|
||||
@@ -132,6 +133,7 @@
|
||||
"examples",
|
||||
"esm",
|
||||
"cjs",
|
||||
"dist",
|
||||
"**/codemod/**/*.js"
|
||||
]
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user