diff --git a/.changeset/dull-masks-build.md b/.changeset/dull-masks-build.md new file mode 100644 index 00000000..ad6baa6a --- /dev/null +++ b/.changeset/dull-masks-build.md @@ -0,0 +1,5 @@ +--- +'@chakra-ui/vue-auto-import': patch +--- + +Improve resolver to import from all Chakra UI components diff --git a/.changeset/kind-tools-camp.md b/.changeset/kind-tools-camp.md new file mode 100644 index 00000000..21636b01 --- /dev/null +++ b/.changeset/kind-tools-camp.md @@ -0,0 +1,29 @@ +--- +'@chakra-ui/c-accordion': minor +'@chakra-ui/c-alert': minor +'@chakra-ui/c-button': minor +'@chakra-ui/c-close-button': minor +'@chakra-ui/c-code': minor +'@chakra-ui/c-color-mode': minor +'@chakra-ui/c-flex': minor +'@chakra-ui/c-icon': minor +'@chakra-ui/c-modal': minor +'@chakra-ui/c-popper': minor +'@chakra-ui/c-portal': minor +'@chakra-ui/c-reset': minor +'@chakra-ui/c-spinner': minor +'@chakra-ui/c-theme-provider': minor +'@chakra-ui/c-visually-hidden': minor +'@chakra-ui/vue-next': minor +'@chakra-ui/vue-layout': minor +'@chakra-ui/nuxt-next': minor +'@chakra-ui/vue-system': minor +'@chakra-ui/vue-test-utils': minor +'@chakra-ui/vue-theme': minor +'@chakra-ui/vue-theme-tools': minor +'@chakra-ui/vue-utils': minor +'@chakra-ui/vue-auto-import': minor +'@chakra-ui/vue-docs': minor +--- + +Created layout components and updated theminnng types for packages. diff --git a/package.json b/package.json index 8042c19c..37233d8f 100644 --- a/package.json +++ b/package.json @@ -59,9 +59,9 @@ "@types/tinycolor2": "^1.4.2", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "4.0.1", - "@vitejs/plugin-vue": "^1.1.4", + "@vitejs/plugin-vue": "^1.2.1", "@vue/babel-plugin-jsx": "^1.0.3", - "@vue/compiler-sfc": "^3.0.6", + "@vue/compiler-sfc": "^3.0.11", "@vue/eslint-config-typescript": "^5.1.0", "@vuedx/typecheck": "^0.4.1", "@vuedx/typescript-plugin-vue": "^0.4.1", @@ -107,13 +107,13 @@ "ts-jest": "^26.5.0", "ts-node": "^9.0.0", "typescript": "^4.1.3", - "vite": "^2.0.1", - "vite-plugin-components": "^0.6.6", - "vite-plugin-pages": "^0.5.1", + "vite": "2.1.5", + "vite-plugin-components": "^0.8.3", + "vite-plugin-pages": "^0.9.2", "vitepress": "^0.12.0", "vue": ">=3.0.5", "vue-jest": "^5.0.0-alpha.7", - "vue-router": "^4.0.4", + "vue-router": "^4.0.6", "vue3-perfect-scrollbar": "^1.5.5" } } diff --git a/packages/c-badge/CHANGELOG.md b/packages/c-badge/CHANGELOG.md deleted file mode 100644 index 5d98e3b1..00000000 --- a/packages/c-badge/CHANGELOG.md +++ /dev/null @@ -1,26 +0,0 @@ -# @chakra-ui/c-badge - -## 1.0.0-alpha.1 - -### Minor Changes - -- [#49](https://github.com/chakra-ui/chakra-ui-vue-next/pull/49) [`cd4893b`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/cd4893b6a27df39b59066c6e1d714b3830cf41bd) Thanks [@carwack](https://github.com/carwack)! - Add Iframe to Dom Element list - -### Patch Changes - -- [#42](https://github.com/chakra-ui/chakra-ui-vue-next/pull/42) [`ccae794`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/ccae794937096c98b50dd5b72ac21856bd0e0e67) Thanks [@codebender828](https://github.com/codebender828)! - Extract Vue dependant utilities to "@chakra-ui/vue-utils" and consumes base utils from "@chakra-ui/utils@1.5.0" - -* [#50](https://github.com/chakra-ui/chakra-ui-vue-next/pull/50) [`082c70b`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/082c70b03bd0e07704e1285592f515b3a43073b4) Thanks [@carwack](https://github.com/carwack)! - Add option to extend icons with custom icons - -* Updated dependencies [[`cd4893b`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/cd4893b6a27df39b59066c6e1d714b3830cf41bd), [`ccae794`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/ccae794937096c98b50dd5b72ac21856bd0e0e67), [`082c70b`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/082c70b03bd0e07704e1285592f515b3a43073b4)]: - - @chakra-ui/vue-system@0.1.0-alpha.1 - -## 0.0.1-alpha.0 - -### Patch Changes - -- [#36](https://github.com/chakra-ui/chakra-ui-vue-next/pull/36) [`8243ac6`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/8243ac6cdc1ef47e56b3ec2f4635f44396273ee8) Thanks [@codebender828](https://github.com/codebender828)! - Initial release for core system packages - -- Updated dependencies [[`8243ac6`](https://github.com/chakra-ui/chakra-ui-vue-next/commit/8243ac6cdc1ef47e56b3ec2f4635f44396273ee8)]: - - @chakra-ui/vue-system@0.0.1-alpha.0 - - @chakra-ui/vue-utils@0.0.1-alpha.0 diff --git a/packages/c-badge/README.md b/packages/c-badge/README.md deleted file mode 100644 index 5e2e29c5..00000000 --- a/packages/c-badge/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# @chakra-ui/c-badge - -Badges are used to highlight an item s status for quick recognition - -## Installation - -```sh -yarn add @chakra-ui/c-badge -# or -npm i @chakra-ui/c-badge -``` \ No newline at end of file diff --git a/packages/c-badge/examples/base-badge.vue b/packages/c-badge/examples/base-badge.vue deleted file mode 100644 index 99dcb745..00000000 --- a/packages/c-badge/examples/base-badge.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/packages/c-badge/examples/outline-badges.vue b/packages/c-badge/examples/outline-badges.vue deleted file mode 100644 index b2496469..00000000 --- a/packages/c-badge/examples/outline-badges.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/c-badge/examples/solid-badge.vue b/packages/c-badge/examples/solid-badge.vue deleted file mode 100644 index e2da05fa..00000000 --- a/packages/c-badge/examples/solid-badge.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/c-badge/examples/subtle-badges.vue b/packages/c-badge/examples/subtle-badges.vue deleted file mode 100644 index be4e8c21..00000000 --- a/packages/c-badge/examples/subtle-badges.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/packages/c-badge/src/badge.ts b/packages/c-badge/src/badge.ts deleted file mode 100644 index cfe5fa11..00000000 --- a/packages/c-badge/src/badge.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { h, defineComponent, PropType, computed } from 'vue' -import { - chakra, - DOMElements, - ThemingProps, - useStyleConfig, -} from '@chakra-ui/vue-system' -import { filterUndefined } from '@chakra-ui/utils' - -const CBadge = defineComponent({ - props: { - as: { - type: [Object, String] as PropType, - default: 'div', - }, - colorScheme: String as PropType, - variant: String as PropType, - size: String as PropType, - styleConfig: String as PropType, - }, - setup(props, { slots, attrs }) { - return () => { - const themingProps = computed(() => - filterUndefined({ - colorScheme: props.colorScheme, - variant: props.variant, - size: props.size, - styleConfig: props.styleConfig, - }) - ) - const styles = useStyleConfig('Badge', themingProps.value) - - return h( - chakra(props.as), - { - __css: { - display: 'inline-block', - whiteSpace: 'nowrap', - verticalAlign: 'middle', - ...styles.value, - }, - ...attrs, - }, - slots - ) - } - }, -}) - -export default CBadge diff --git a/packages/c-badge/src/index.ts b/packages/c-badge/src/index.ts deleted file mode 100644 index 86c56a32..00000000 --- a/packages/c-badge/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as CBadge } from './badge' diff --git a/packages/c-badge/tests/__snapshots__/c-badge.test.ts.snap b/packages/c-badge/tests/__snapshots__/c-badge.test.ts.snap deleted file mode 100644 index bde614fa..00000000 --- a/packages/c-badge/tests/__snapshots__/c-badge.test.ts.snap +++ /dev/null @@ -1,11 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`should render properly 1`] = ` - -
- New ! -
-
-`; diff --git a/packages/c-badge/tests/c-badge.test.ts b/packages/c-badge/tests/c-badge.test.ts deleted file mode 100644 index 7b742476..00000000 --- a/packages/c-badge/tests/c-badge.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { CBadge } from '../src' -import { render, testA11y } from '../../test-utils/src' - -const renderComponent = (props?: any) => { - const base = { - components: { - CBadge, - }, - template: 'New !', - ...props, - } - return render(base) -} - -it('should have no a11y violations', async () => { - await testA11y(renderComponent()) -}) - -it('should render properly', () => { - const { asFragment } = renderComponent() - expect(asFragment()).toMatchSnapshot() -}) diff --git a/packages/c-button/src/button-group.ts b/packages/c-button/src/button-group.ts index 040aa194..62b3cdce 100644 --- a/packages/c-button/src/button-group.ts +++ b/packages/c-button/src/button-group.ts @@ -4,7 +4,7 @@ import { SystemStyleObject, } from '@chakra-ui/styled-system' import { chakra, ThemingProps } from '@chakra-ui/vue-system' -import { createContext } from '@chakra-ui/vue-utils' +import { createContext, vueThemingProps } from '@chakra-ui/vue-utils' export interface ButtonGroupProps extends ThemingProps { /** @@ -31,16 +31,7 @@ const props = { type: [String, Number, Array] as PropType, default: 3, }, - variant: { - type: String as PropType, - default: 'solid', - }, - size: { - type: String as PropType, - default: 'sm', - }, - colorScheme: String as PropType, - styleConfig: String as PropType, + ...vueThemingProps, } type ButtonGroupContext = () => ThemingProps & { diff --git a/packages/c-button/src/button.utils.ts b/packages/c-button/src/button.utils.ts index 2f365cf3..180353fb 100644 --- a/packages/c-button/src/button.utils.ts +++ b/packages/c-button/src/button.utils.ts @@ -1,5 +1,6 @@ import { SystemCSSProperties } from '@chakra-ui/styled-system' -import { DOMElements, ThemingProps } from '@chakra-ui/vue-system' +import { DOMElements } from '@chakra-ui/vue-system' +import { vueThemingProps } from '@chakra-ui/vue-utils' import { PropType } from 'vue' type ButtonTypes = 'button' | 'reset' | 'submit' @@ -17,10 +18,7 @@ export const BUTTON_PROPS = { type: String as PropType, leftIcon: String as PropType, rightIcon: String as PropType, - colorScheme: String as PropType, - variant: String as PropType, - size: String as PropType, - styleConfig: String as PropType, + ...vueThemingProps, /** Not sure if the SystemCSSProperties is the right prop type for this */ iconSpacing: { diff --git a/packages/c-button/src/icon-button.ts b/packages/c-button/src/icon-button.ts index 56a58e8c..69f44541 100644 --- a/packages/c-button/src/icon-button.ts +++ b/packages/c-button/src/icon-button.ts @@ -38,6 +38,8 @@ const CIconButton = defineComponent({ ...props, }, () => [ + // whats the problem here? + // @ts-ignore h(CIcon, { name: props.icon, }), diff --git a/packages/c-button/tests/__snapshots__/c-button-group.test.ts.snap b/packages/c-button/tests/__snapshots__/c-button-group.test.ts.snap index db485ee7..f8f41c37 100644 --- a/packages/c-button/tests/__snapshots__/c-button-group.test.ts.snap +++ b/packages/c-button/tests/__snapshots__/c-button-group.test.ts.snap @@ -7,7 +7,7 @@ exports[`should render properly 1`] = ` role="group" >