fix: conflicts between next and main v2 #281
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### [1.15.1](freenowtech/wave@v1.15.0...v1.15.1) (2021-10-15) ### Bug Fixes * adding disabled state for datepicker ([freenowtech#181](freenowtech#181)) ([313f424](freenowtech@313f424))
* feat: add Accordion component and basic documentation * feat: added test * chore: remove default export and add PropsWithChildren * chore: update api table * chore: chheck place holder to not be in document * chore: added onExpand and onCollapse * chore: solve lint issues * chore: solve lint issues * chore: solve lint issues Co-authored-by: David Barrera <d.barrera@mytaxi.com>
## [1.16.0](freenowtech/wave@v1.15.1...v1.16.0) (2021-10-25) ### Features * added Accordion component ([freenowtech#172](freenowtech#172)) ([439b67c](freenowtech@439b67c))
### [1.16.1](freenowtech/wave@v1.16.0...v1.16.1) (2021-10-26) ### Bug Fixes * add layout props to TableHeaderCell and TableCell ([freenowtech#185](freenowtech#185)) ([0915c58](freenowtech@0915c58))
### [1.16.2](freenowtech/wave@v1.16.1...v1.16.2) (2021-11-17) ### Bug Fixes * cleanup Modal timeout ([freenowtech#193](freenowtech#193)) ([fcb1341](freenowtech@fcb1341))
## [1.17.0](freenowtech/wave@v1.16.2...v1.17.0) (2021-12-09) ### Features * add secondary variant for text component ([freenowtech#170](freenowtech#170)) ([f056fea](freenowtech@f056fea))
Closes issue freenowtech#190 * test: add test that reproduces the bug * fix: add default theme declaration * fix: avoid collision of `color` prop * chore: remove StyledComponentBase typing * fix: update prop compatibility * test: remove snapshot
### [1.17.1](freenowtech/wave@v1.17.0...v1.17.1) (2022-01-26) ### Bug Fixes * spread Box props correctly ([9dac265](freenowtech@9dac265)), closes [freenowtech#190](freenowtech#190)
* feat: update assets icons to match design icons * feat: generate icons with new asset icons * fix: redirect import deprecated icons to icon/index * fix: import icons from icons/index file * docs: add new icons & divide in sections * test: update snapshots style-components classes names Co-authored-by: Leonardo Di Vittorio <leo@MacBook-Pro-de-Leonardo.local>
* test: add test that reproduces the bug * fix: add default theme declaration * fix: avoid collision of `color` prop * chore: remove StyledComponentBase typing * fix: update prop compatibility * feat: add grid system components * refactor: use flexbox approach * refactor: rework flex approach * docs: add stacking card example * fix: remove unnused import * test: add snapshot tests * feat: avoid setting marging left when 0 * feat: only use 4 decimals * test: remove old snapshot * Feat/add missing icons (freenowtech#200) * feat: update assets icons to match design icons * feat: generate icons with new asset icons * fix: redirect import deprecated icons to icon/index * fix: import icons from icons/index file * docs: add new icons & divide in sections * test: update snapshots style-components classes names Co-authored-by: Leonardo Di Vittorio <leo@MacBook-Pro-de-Leonardo.local> * 1.17.2-canary.0 * chore: expose grid components Co-authored-by: Leonardo <leonardo.divittorio@live.it> Co-authored-by: Leonardo Di Vittorio <leo@MacBook-Pro-de-Leonardo.local>
## [1.18.0](freenowtech/wave@v1.17.1...v1.18.0) (2022-02-01) ### Features * add grid system components ([freenowtech#198](freenowtech#198)) ([c435683](freenowtech@c435683)), closes [freenowtech#200](freenowtech#200)
### [1.18.1](freenowtech/wave@v1.18.0...v1.18.1) (2022-02-05) ### Bug Fixes * replace weak prop with secondary ([freenowtech#206](freenowtech#206)) ([37a7f4f](freenowtech@37a7f4f))
## [1.19.0](freenowtech/wave@v1.18.1...v1.19.0) (2022-03-08) ### Features * remove brand colors from semantic colors object ([freenowtech#208](freenowtech#208)) ([1ccb794](freenowtech@1ccb794))
## [1.20.0](freenowtech/wave@v1.19.0...v1.20.0) (2022-04-21) ### Features * adds select page size component ([freenowtech#201](freenowtech#201)) ([068b958](freenowtech@068b958))
Co-authored-by: Martí Malek <marti.malek@free-now.com>
* feat: add Divider component to Wave * feat(divider): add default offset to the divider add additional tests to check the default offset * fix(divider): allow usage of 1px in .stylelintrc Needed to change stylelintrc config to allow usage of px unit for divider * Update src/components/Divider/Divider.spec.tsx Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * Update src/components/Divider/Divider.spec.tsx Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * Update src/components/Divider/docs/Divider.mdx Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * Update src/components/Divider/docs/Divider.mdx Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * Update src/components/Divider/docs/Divider.mdx Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> Co-authored-by: Ján Hamara <jan.hamara@free-now.com> Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com>
…owtech#258) * fix: display semantic colors in table and allow to filter them * refactor: improve performance of SemanticColorsTable * fix: trim table filter input Co-authored-by: Martí Malek <marti.malek@free-now.com>
### [1.25.2](freenowtech/wave@v1.25.1...v1.25.2) (2022-07-11) ### Bug Fixes * display semantic colors in table and allow to filter them ([freenowtech#258](freenowtech#258)) ([2e83e76](freenowtech@2e83e76))
removes Rafa from the list 😢
…h#262) Co-authored-by: Ján Hamara <jan.hamara@free-now.com>
…eenowtech#263) * style(popover): expose padding prop for Popover component * fix: update zIndex on Popover content container Co-authored-by: Ján Hamara <jan.hamara@free-now.com>
### [1.25.3](freenowtech/wave@v1.25.2...v1.25.3) (2022-07-21) ### Bug Fixes * expose padding prop and adjust z-index for Popover component ([freenowtech#263](freenowtech#263)) ([da0e80b](freenowtech@da0e80b))
Exposes properties to reach lower-level components of the `PhoneInput` Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com>
* Merge main (freenowtech#270) * docs: remove the experimental label for table (freenowtech#255) * fix: display semantic colors in table and allow to filter them (freenowtech#258) * fix: display semantic colors in table and allow to filter them * refactor: improve performance of SemanticColorsTable * fix: trim table filter input Co-authored-by: Martí Malek <marti.malek@free-now.com> * chore(release): 1.25.2 [skip ci] ### [1.25.2](freenowtech/wave@v1.25.1...v1.25.2) (2022-07-11) ### Bug Fixes * display semantic colors in table and allow to filter them ([freenowtech#258](freenowtech#258)) ([2e83e76](freenowtech@2e83e76)) * update codeowners removes Rafa from the list 😢 * style(popover): expose padding prop for Popover component (freenowtech#262) Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * fix: expose padding prop and adjust z-index for Popover component (freenowtech#263) * style(popover): expose padding prop for Popover component * fix: update zIndex on Popover content container Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * chore(release): 1.25.3 [skip ci] ### [1.25.3](freenowtech/wave@v1.25.2...v1.25.3) (2022-07-21) ### Bug Fixes * expose padding prop and adjust z-index for Popover component ([freenowtech#263](freenowtech#263)) ([da0e80b](freenowtech@da0e80b)) * Expand PhoneInput API (freenowtech#261) Exposes properties to reach lower-level components of the `PhoneInput` Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * 1.26.0 * 1.26.1 Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> Co-authored-by: Martí Malek <marti.malek@free-now.com> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net> Co-authored-by: Nikolai Lopin <nikolai.lopin@free-now.com> Co-authored-by: Jan Hamara <hamara.jan18@gmail.com> Co-authored-by: Ján Hamara <jan.hamara@free-now.com> Co-authored-by: Nikolai Lopin <nikolai.lopin@mytaxi.com> * docs(headline): update props table * improvement: adding props table for filepicker * docs(pagination): update props table * docs(select): update props table * Issue 10 add prop documentation (freenowtech#271) * docs(tabbar): update props table * improvement: props table for datepicker * improvement: adding props table to Tooltip * improvement: adding PropsTable to Toggle * improvement: adding propstable for Textarea * merging main with the prop branch (freenowtech#277) * docs: remove the experimental label for table (freenowtech#255) * fix: display semantic colors in table and allow to filter them (freenowtech#258) * fix: display semantic colors in table and allow to filter them * refactor: improve performance of SemanticColorsTable * fix: trim table filter input Co-authored-by: Martí Malek <marti.malek@free-now.com> * chore(release): 1.25.2 [skip ci] ### [1.25.2](freenowtech/wave@v1.25.1...v1.25.2) (2022-07-11) ### Bug Fixes * display semantic colors in table and allow to filter them ([freenowtech#258](freenowtech#258)) ([2e83e76](freenowtech@2e83e76)) * update codeowners removes Rafa from the list 😢 * style(popover): expose padding prop for Popover component (freenowtech#262) Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * fix: expose padding prop and adjust z-index for Popover component (freenowtech#263) * style(popover): expose padding prop for Popover component * fix: update zIndex on Popover content container Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * chore(release): 1.25.3 [skip ci] ### [1.25.3](freenowtech/wave@v1.25.2...v1.25.3) (2022-07-21) ### Bug Fixes * expose padding prop and adjust z-index for Popover component ([freenowtech#263](freenowtech#263)) ([da0e80b](freenowtech@da0e80b)) * Expand PhoneInput API (freenowtech#261) Exposes properties to reach lower-level components of the `PhoneInput` Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * 1.26.0 * 1.26.1 Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> Co-authored-by: Martí Malek <marti.malek@free-now.com> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net> Co-authored-by: Nikolai Lopin <nikolai.lopin@free-now.com> Co-authored-by: Jan Hamara <hamara.jan18@gmail.com> Co-authored-by: Ján Hamara <jan.hamara@free-now.com> Co-authored-by: Nikolai Lopin <nikolai.lopin@mytaxi.com> * docs(props-table): add props table to Table docs (freenowtech#275) * docs: remove the experimental label for table (freenowtech#255) * fix: display semantic colors in table and allow to filter them (freenowtech#258) * fix: display semantic colors in table and allow to filter them * refactor: improve performance of SemanticColorsTable * fix: trim table filter input Co-authored-by: Martí Malek <marti.malek@free-now.com> * chore(release): 1.25.2 [skip ci] ### [1.25.2](freenowtech/wave@v1.25.1...v1.25.2) (2022-07-11) ### Bug Fixes * display semantic colors in table and allow to filter them ([freenowtech#258](freenowtech#258)) ([2e83e76](freenowtech@2e83e76)) * update codeowners removes Rafa from the list 😢 * style(popover): expose padding prop for Popover component (freenowtech#262) Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * fix: expose padding prop and adjust z-index for Popover component (freenowtech#263) * style(popover): expose padding prop for Popover component * fix: update zIndex on Popover content container Co-authored-by: Ján Hamara <jan.hamara@free-now.com> * chore(release): 1.25.3 [skip ci] ### [1.25.3](freenowtech/wave@v1.25.2...v1.25.3) (2022-07-21) ### Bug Fixes * expose padding prop and adjust z-index for Popover component ([freenowtech#263](freenowtech#263)) ([da0e80b](freenowtech@da0e80b)) * Expand PhoneInput API (freenowtech#261) Exposes properties to reach lower-level components of the `PhoneInput` Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> * 1.26.0 * 1.26.1 * docs(props-table): add props table to Table docs * chore: update package-lock.json Co-authored-by: Lloyd Francis <lloydaf@gmail.com> Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> Co-authored-by: Martí Malek <marti.malek@free-now.com> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net> Co-authored-by: Nikolai Lopin <nikolai.lopin@free-now.com> Co-authored-by: Jan Hamara <hamara.jan18@gmail.com> Co-authored-by: Ján Hamara <jan.hamara@free-now.com> Co-authored-by: Nikolai Lopin <nikolai.lopin@mytaxi.com> * docs(table): remove unused tables * docs(datepicker): add links to styled-system props * docs(textarea): add semicolons * docs(toggle): add classname and styled-system props to the documentation * docs(select): change import order * docs(filepicker): add styled-system props link * docs(headline): add styled-system props link * docs(helpertext): add styled-system props link * docs(link): add styled-system props link * docs(tag): add styled-system props link Co-authored-by: martimalek <46452321+martimalek@users.noreply.github.com> Co-authored-by: Martí Malek <marti.malek@free-now.com> Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net> Co-authored-by: Nikolai Lopin <nikolai.lopin@free-now.com> Co-authored-by: Jan Hamara <hamara.jan18@gmail.com> Co-authored-by: Ján Hamara <jan.hamara@free-now.com> Co-authored-by: Nikolai Lopin <nikolai.lopin@mytaxi.com> Co-authored-by: dani-walnut <84320593+dani-walnut@users.noreply.github.com> Co-authored-by: Artur Miglio <arturmiglio@gmail.com>
martimalek
added
the
CI/CD
martimalek
requested review from
nlopin,
div-Leo and
jonotrujillo
as code owners
* feat: init use react-popper on Tooltip component * refactor: remove global styles and use popper attributes for placement * fix: access placement map direcly and add comments * fix: fixies and function for deprecated values * docs: update documentation for tooltip * fix: remove early return and use content to display or not the TooltipBody * fix: update tooltip docs to show react popper instead of thetter * fix: use popper placement instead of TooltipPlacement on TooltipPlacementExample * fix: move map function to TooltipPlacement.ts back * fix: left and right start and end arrow placements * fix: wrap on PropTable column Type on whitespace * fix: remove done todos Co-authored-by: Nelson Dornelas <nelson.dornelas@free-now.com> Co-authored-by: Leonardo Di Vittorio <leonardo.divittorio@Leonardos-MacBook-Pro.local>
## [1.27.0](freenowtech/wave@v1.26.1...v1.27.0) (2022-08-19) ### Features * Tooltip with react-popper ([freenowtech#267](freenowtech#267)) ([6965ef4](freenowtech@6965ef4))
nlopin
approved these changes
Aug 20, 2022
github-actions bot
pushed a commit
that referenced
this pull request
Aug 20, 2022
## [2.1.0-next.2](v2.1.0-next.1...v2.1.0-next.2) (2022-08-20) ### Bug Fixes * adding disabled state for datepicker ([#181](#181)) ([313f424](313f424)) * conflicts between next and main ([#257](#257)) ([0a103ef](0a103ef)), closes [#181](#181) [#183](#183) [#172](#172) [#172](#172) [#185](#185) [#185](#185) [#193](#193) [#193](#193) [#170](#170) [#170](#170) [#196](#196) [#190](#190) [#190](#190) [#200](#200) [#198](#198) [#200](#200) [#200](#200) [#206](#206) [#206](#206) [#208](#208) [#208](#208) [#201](#201) [#201](#201) [#214](#214) [#223](#223) [#221](#221) [#228](#228) [#228](#228) [#231](#231) [#220](#220) [#220](#220) [#230](#230) [#234](#234) [#230](#230) [#234](#234) [#236](#236) [#233](#233) [#233](#233) [#243](#243) [#244](#244) [#235](#235) [#246](#246) [#246](#246) [#248](#248) [#225](#225) [#225](#225) [#248](#248) [#222](#222) [#222](#222) [#255](#255) * conflicts between next and main v2 ([#281](#281)) ([bec6bdc](bec6bdc))
|
🎉 This PR is included in version 2.1.0-next.2 🎉 The release is available on: Your semantic-release bot 📦🚀 |
|
🎉 This PR is included in version 3.0.0-next.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What:
The past month I opened a PR where I tried to resolve conflicts between
mainandnext(#257). That didn't really solve the issue, the conflicts still appeared. This PR aims to solve this issue once and for all.
Why:
It's making our CI fail.
How:
I've created a branch from
next, mergedmaininto it and accepted all incoming changes.