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
23 commits
Select commit Hold shift + click to select a range
ec327fb
chore(release): version packages
github-actions[bot] Jul 9, 2021
9654179
Use emotion-jest-serializer to enhance snapshot test, make it more re…
simpletrontdip Jul 13, 2021
4682c8d
Add original chakra-ui/styled-system
simpletrontdip Jul 16, 2021
fd14ca1
Update tests for Button
simpletrontdip Jul 16, 2021
815647f
Update snapshot for new styled-sytem
simpletrontdip Jul 16, 2021
227a995
Remove old styled-system in code
simpletrontdip Jul 16, 2021
d943ecf
Refine CSS component
simpletrontdip Jul 16, 2021
7204798
Remove tx in ControlBox in favor of new theme api
simpletrontdip Jul 16, 2021
a872dc1
Remove redundant tx
simpletrontdip Jul 16, 2021
0b0c85a
Merge branch 'master' of github.com:simpletrontdip/chakra-ui-vue
simpletrontdip Jul 16, 2021
e317030
Merge branch 'master' into develop
simpletrontdip Jul 16, 2021
50f9fb1
Remove unused styled-system and its deps
simpletrontdip Jul 16, 2021
79802b0
Refine theme importing, add test for ThemeProvider
simpletrontdip Jul 18, 2021
d59cb11
Linting the code
simpletrontdip Jul 18, 2021
9d56eda
Refine spacing in style constants, update snapshots
simpletrontdip Jul 18, 2021
4e46fcc
Move props.types upper 1 level
simpletrontdip Jul 18, 2021
22450e7
Add stories to test noOfLines, textDecor, isTRuncated in Text
simpletrontdip Jul 18, 2021
5a53916
Linting the code
simpletrontdip Jul 18, 2021
f203fe3
Support baseStyle setting in theme
simpletrontdip Jul 19, 2021
a01ea6d
Add baseStyle tests for component
simpletrontdip Jul 19, 2021
913d502
Use bgColor to support stripe in cprogress
simpletrontdip Jul 19, 2021
f9ae5e5
Support baseStyle as a function
simpletrontdip Jul 21, 2021
2f5258e
Fix typo in test file
simpletrontdip Jul 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ module.exports = {
breadstick: require.resolve('./tests/test-utils/module-mock.js')
},
snapshotSerializers: [
'jest-serializer-vue'
'jest-serializer-vue',
'@emotion/jest/serializer'
],
testMatch: [
'**/**/*.test.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"evalbundle": "bundlesize"
},
"dependencies": {
"@chakra-ui/styled-system": "^1.12.1",
"@emotion/css": "^11.0.0",
"@mdx-js/vue-loader": "^1.6.1",
"@nuxtjs/dotenv": "^1.4.0",
Expand All @@ -61,7 +62,6 @@
"@storybook/storybook-deployer": "^2.8.1",
"@storybook/theming": "^5.2.8",
"@storybook/vue": "^5.3.3",
"@styled-system/css": "^5.0.23",
"aria-hidden": "^1.1.1",
"breadstick": "^0.2.14",
"can-use-dom": "^0.1.0",
Expand Down Expand Up @@ -91,7 +91,6 @@
"prismjs": "^1.19.0",
"register-service-worker": "^1.6.2",
"sass-loader": "^8.0.2",
"styled-system": "^5.1.2",
"v-scroll-lock": "^1.1.0",
"vue": "^2.6.11",
"vue-error-boundary": "^1.0.3",
Expand All @@ -118,6 +117,7 @@
"@commitlint/config-conventional": "^8.2.0",
"@emotion/babel-plugin": "^11.1.2",
"@emotion/eslint-plugin": "^11.0.0",
"@emotion/jest": "^11.3.0",
"@nuxtjs/eslint-config": "^3.0.0",
"@nuxtjs/eslint-module": "^1.0.0",
"@nuxtjs/google-analytics": "^2.4.0",
Expand Down Expand Up @@ -169,7 +169,6 @@
"rollup-plugin-scss": "^2.1.0",
"rollup-plugin-terser": "^5.1.2",
"rollup-plugin-vue": "^5.1.4",
"styled-system": "^5.1.2",
"v-scroll-lock": "^1.1.0",
"vue-loader": "^15.7.1",
"vue-lorem-ipsum": "^0.0.1",
Expand Down
3 changes: 1 addition & 2 deletions packages/chakra-ui-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"max-overall-size": "85KB"
},
"dependencies": {
"@chakra-ui/styled-system": "^1.12.1",
"@popperjs/core": "^2.4.0",
"@styled-system/css": "^5.0.23",
"animejs": "^3.1.0",
"aria-hidden": "^1.1.1",
"breadstick": "^0.2.14",
Expand All @@ -46,7 +46,6 @@
"focus-trap-vue": "^0.0.4",
"lodash-es": "^4.17.15",
"portal-vue": "^2.1.6",
"styled-system": "^5.1.2",
"v-scroll-lock": "^1.1.0"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,111 @@

exports[`should render correctly 1`] = `
<DocumentFragment>
<div
class="css-0"
.emotion-2 {
border-top-width: 1px;
}

.emotion-2:last-of-type {
border-bottom-width: 1px;
}

.emotion-3 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
width: 100%;
outline: 2px solid transparent;
outline-offset: 2px;
-webkit-transition: all 0.2s;
transition: all 0.2s;
-webkit-padding-start: var(--space-4);
padding-inline-start: var(--space-4);
-webkit-padding-end: var(--space-4);
padding-inline-end: var(--space-4);
padding-top: var(--space-2);
padding-bottom: var(--space-2);
}

.emotion-3:focus,
.emotion-3[data-focus] {
box-shadow: var(--shadows-outline);
}

.emotion-3:hover,
.emotion-3[data-hover] {
background: var(--colors-blackAlpha-50);
}

.emotion-3[disabled],
.emotion-3[aria-disabled=true],
.emotion-3[data-disabled] {
opacity: 0.4;
cursor: not-allowed;
}

.emotion-4 {
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
}

.emotion-4:not(:root) {
overflow: hidden;
}

.emotion-5 {
width: 1em;
height: 1em;
display: inline-block;
vertical-align: middle;
}

.emotion-7 {
opacity: 1;
-webkit-transform: rotate(-180deg);
-moz-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
transform: rotate(-180deg);
-webkit-transition: -webkit-transform 0.2s;
transition: transform 0.2s;
transform-origin: center;
}

.emotion-8 {
padding-top: var(--space-2);
-webkit-padding-start: var(--space-4);
padding-inline-start: var(--space-4);
-webkit-padding-end: var(--space-4);
padding-inline-end: var(--space-4);
padding-bottom: var(--space-5);
}

<div
class="emotion-0"
data-chakra-component="CAccordion"
>
<div
class="css-0 css-1b3isn8"
class="emotion-0 emotion-2"
data-chakra-component="CAccordionItem"
>
<button
aria-controls="accordion-panel-ac-1"
aria-expanded="true"
class="css-3q8x3d"
class="emotion-3"
data-chakra-component="CAccordionHeader"
id="accordion-header-ac-1"
type="button"
>
Section 1 title
<svg
class="css-12j51pv css-3vopgu css-0 css-1cdnf31"
class="emotion-4 emotion-5 emotion-0 emotion-7"
data-chakra-component="CAccordionIcon"
role="presentation"
viewBox="0 0 24 24"
Expand All @@ -40,7 +126,7 @@ exports[`should render correctly 1`] = `
>
<div
aria-labelledby="accordion-header-ac-1"
class="css-t2ecxu"
class="emotion-8"
data-chakra-component="CAccordionPanel"
id="accordion-panel-ac-1"
role="region"
Expand Down
Loading