Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4d58750
chore(deps): bump trim-off-newlines from 1.0.1 to 1.0.3
dependabot[bot] Jan 19, 2022
490d30b
chore(deps): bump shelljs from 0.8.3 to 0.8.5
dependabot[bot] Jan 19, 2022
c3dc44c
Include all position values in CToast
t-buss Jan 26, 2022
f4e9f00
Merge pull request #517 from t-buss/patch-2
codebender828 Jan 31, 2022
0b344b9
chore(deps): bump pathval from 1.1.0 to 1.1.1
dependabot[bot] Feb 11, 2022
2303c3a
chore(deps): bump handlebars from 4.7.5 to 4.7.7
dependabot[bot] Feb 11, 2022
2605c0c
chore(deps): bump prismjs from 1.19.0 to 1.27.0
dependabot[bot] Feb 26, 2022
9ca13f9
chore(deps): bump url-parse from 1.4.7 to 1.5.10
dependabot[bot] Feb 28, 2022
3af6b39
chore(deps): bump lodash-es from 4.17.15 to 4.17.21
dependabot[bot] Mar 15, 2022
f4ba136
chore(deps): bump minimist from 1.2.5 to 1.2.6
dependabot[bot] Apr 1, 2022
2cdd2f0
chore(deps): bump nanoid from 3.1.25 to 3.3.4
dependabot[bot] May 16, 2022
1a9ae9a
fix(docs): fix typo in link
carwack May 30, 2022
55221e3
fix(docs: undo prettier changes
carwack May 30, 2022
48142a8
Merge pull request #533 from chakra-ui/dependabot/npm_and_yarn/nanoid…
codebender828 May 30, 2022
b496b9a
Merge branch 'develop' into dependabot/npm_and_yarn/minimist-1.2.6
codebender828 May 30, 2022
c9bb064
Merge branch 'develop' into b/535-docs-accessibility-link-report-circ…
codebender828 May 30, 2022
79c0db6
Merge pull request #525 from chakra-ui/dependabot/npm_and_yarn/minimi…
codebender828 May 30, 2022
012faba
Merge pull request #524 from chakra-ui/dependabot/npm_and_yarn/lodash…
codebender828 May 30, 2022
c3e70f8
Merge pull request #523 from chakra-ui/dependabot/npm_and_yarn/url-pa…
codebender828 May 30, 2022
22f2f7f
Merge branch 'develop' into dependabot/npm_and_yarn/prismjs-1.27.0
codebender828 May 30, 2022
16cf82a
Merge pull request #522 from chakra-ui/dependabot/npm_and_yarn/prismj…
codebender828 May 30, 2022
81ec966
Merge branch 'develop' into dependabot/npm_and_yarn/handlebars-4.7.7
codebender828 May 30, 2022
6e25a42
Merge pull request #520 from chakra-ui/dependabot/npm_and_yarn/handle…
codebender828 May 30, 2022
2e23dfa
Merge branch 'develop' into dependabot/npm_and_yarn/pathval-1.1.1
codebender828 May 30, 2022
fdfe9c6
Merge pull request #519 from chakra-ui/dependabot/npm_and_yarn/pathva…
codebender828 May 30, 2022
70402de
chore(deps): bump ws from 5.2.2 to 5.2.3
dependabot[bot] May 30, 2022
f6f7860
Merge branch 'develop' into dependabot/npm_and_yarn/shelljs-0.8.5
codebender828 May 30, 2022
969d387
Merge pull request #510 from chakra-ui/dependabot/npm_and_yarn/shellj…
codebender828 May 30, 2022
6b97598
Merge branch 'develop' into dependabot/npm_and_yarn/trim-off-newlines…
codebender828 May 30, 2022
9fd7c1f
Merge pull request #509 from chakra-ui/dependabot/npm_and_yarn/trim-o…
codebender828 May 30, 2022
be43d82
Merge branch 'develop' into dependabot/npm_and_yarn/ws-5.2.3
codebender828 May 30, 2022
249b78c
Merge pull request #508 from chakra-ui/dependabot/npm_and_yarn/ws-5.2.3
codebender828 May 30, 2022
66da32c
Merge branch 'develop' into b/535-docs-accessibility-link-report-circ…
codebender828 May 30, 2022
b4dccdb
Merge pull request #536 from carwack/b/535-docs-accessibility-link-re…
codebender828 May 30, 2022
ce892ad
chore(deps): add defu as peerDependency
navarroaxel Jun 10, 2022
f2da594
feat: update core scss dependenciesgp
codebender828 Jun 13, 2022
442faab
chore: create changeset
codebender828 Jun 13, 2022
2f9d402
Merge branch 'develop' into fix/defu
codebender828 Jun 13, 2022
2175435
Merge pull request #538 from navarroaxel/fix/defu
codebender828 Jun 13, 2022
0800981
Merge branch 'master' into develop
codebender828 Jun 13, 2022
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .changeset/empty-dryers-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'nuxt-js': minor
'@chakra-ui/vue': minor
'@chakra-ui/nuxt': minor
'@chakra-ui/theme-vue': minor
'chakra-ui-docs': minor
---

fix: Include all position values in CToast, fix: import in custom theme code snippet
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-plugin-pwa": "^3.11.0",
"@vue/cli-plugin-unit-jest": "^3.11.0",
"@vue/devtools": "^5.3.3",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/test-utils": "1.0.0-beta.29",
"add": "^2.0.6",
Expand All @@ -126,7 +125,7 @@
"copy-to-clipboard": "^3.3.1",
"core-js": "^3.15.1",
"cross-env": "^7.0.2",
"defu": "^2.0.4",
"defu": "^6.0.0",
"dotenv-defaults": "^1.1.1",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.10.0",
Expand Down Expand Up @@ -165,7 +164,7 @@
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-jsx": "^1.0.3",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-scss": "^2.1.0",
"rollup-plugin-scss": "3",
"rollup-plugin-terser": "^5.1.2",
"rollup-plugin-vue": "^5.1.4",
"sass-loader": "^8.0.2",
Expand Down Expand Up @@ -196,5 +195,8 @@
"styled-system",
"kittens ;)"
],
"version": "0.0.0"
"version": "0.0.0",
"devDependencies": {
"sass": "^1.52.3"
}
}
2 changes: 1 addition & 1 deletion packages/chakra-ui-core/src/CToast/CToast.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
interface ChakraToastOptions {
position?: 'bottom' | 'top' | 'right' | 'left'
position?: 'bottom' | 'top' | 'right' | 'left' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
duration?: number
render?: (options: { onClose?: VoidFunction, id: any }) => any
title?: string
Expand Down
2 changes: 1 addition & 1 deletion packages/chakra-ui-nuxt/lib/module.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { resolve } = require('path')
const defu = require('defu')
const { defu } = require('defu')
const { parsePackIcons, internalIcons, createServerDirective } = require('@chakra-ui/vue')
const defaultTheme = require('@chakra-ui/theme-vue')
const { ChakraLoaderPlugin } = require('chakra-loader')
Expand Down
3 changes: 2 additions & 1 deletion packages/chakra-ui-nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"chakra-loader": "latest"
},
"peerDependencies": {
"@nuxtjs/emotion": "^0.1.0"
"@nuxtjs/emotion": "^0.1.0",
"defu": ">=6.0.0"
},
"devDependencies": {
"@babel/core": "^7.9.6",
Expand Down
46 changes: 22 additions & 24 deletions website/pages/circularprogress.mdx
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import SEO from "../components/SEO";

<SEO title="Circular Progress" description="Circular Progress is used to indicates the progress for determinate and indeterminate processes." />



<SEO
title="Circular Progress"
description="Circular Progress is used to indicates the progress for determinate and indeterminate processes."
/>

# Circular Progress

The Circular Progress component is used to indicates the progress for both determinate and indeterminate processes.

- Determinate progress fills the circular track with color, as the indicator
moves from 0 to 360 degrees.
- Indeterminate progress grows and shrinks the indicator while moving along the
circular track.


See `CCircularProgress`'s <a target="_blank" href="https://github.com/chakra-ui/chakra-ui-vue/blob/master/packages/chakra-ui-core/src/CCircularProgress/accesibility.md">accessibility report</a>

See `CCircularProgress`'s <a target="_blank" href="https://github.com/chakra-ui/chakra-ui-vue/blob/master/packages/chakra-ui-core/src/CCircularProgress/accessibility.md">accessibility report</a>

<carbon-ad />

Expand All @@ -25,14 +24,12 @@ See `CCircularProgress`'s <a target="_blank" href="https://github.com/chakra-ui/
import { CCircularProgress, CCircularProgressLabel } from "@chakra-ui/vue";
```


## Usage

```vue live=true
<c-circular-progress :value="80" />
```


### Changing the size

You can add `size` prop to the progress bar to add a custom size.
Expand Down Expand Up @@ -79,7 +76,7 @@ Setting the progress to indeterminate means you're not able to determine the
`value` upfront, so won't need to pass the `value` prop.

```vue live=true
<c-circular-progress is-indeterminate/>
<c-circular-progress is-indeterminate />
```

### Accessibility
Expand All @@ -90,19 +87,20 @@ Setting the progress to indeterminate means you're not able to determine the

## Props

| Name | Type | Default | Description |
| --------------- | ----------------- | ------- | ---------------------------------------------------------------------------------------------------------------- |
| size | `string` | `48px` | The size of the circular progress in CSS units |
| max | `number` | `100` | Maximum value defining 100% progress made (must be higher than 'min') |
| min | `number` | `0` | Minimum value defining 'no progress' (must be lower than 'max') |
| value | `number` | | Current progress (must be between min/max) |
| isIndeterminate | `boolean` | | Puts the component into 'indeterminate' state; Ignores 'value' prop |
| thickness | `number` | `0.2` | The thickness of progress indicator as a ratio of `size`. Must be between `0` and `1` |
| angle | `number` | `0` | Angle to rotate progress indicator by |
| trackColor | `string` | `gray` | The color name of the progress track. Use a color key in the theme object |
| color | `string` | `blue` | The color of the progress indicator. Use a color key in the theme object |
| Name | Type | Default | Description |
| --------------- | --------- | ------- | ------------------------------------------------------------------------------------- |
| size | `string` | `48px` | The size of the circular progress in CSS units |
| max | `number` | `100` | Maximum value defining 100% progress made (must be higher than 'min') |
| min | `number` | `0` | Minimum value defining 'no progress' (must be lower than 'max') |
| value | `number` | | Current progress (must be between min/max) |
| isIndeterminate | `boolean` | | Puts the component into 'indeterminate' state; Ignores 'value' prop |
| thickness | `number` | `0.2` | The thickness of progress indicator as a ratio of `size`. Must be between `0` and `1` |
| angle | `number` | `0` | Angle to rotate progress indicator by |
| trackColor | `string` | `gray` | The color name of the progress track. Use a color key in the theme object |
| color | `string` | `blue` | The color of the progress indicator. Use a color key in the theme object |

## Slots
| Name | Description |
| ---------- | --------------------------------------------------------------------------------- |
| default | Used for the `CCircularProgressLabel` to display the current progress percentage |

| Name | Description |
| ------- | -------------------------------------------------------------------------------- |
| default | Used for the `CCircularProgressLabel` to display the current progress percentage |
Loading