Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Slider] Add sx prop in SliderStyled #23205

Merged
merged 89 commits into from
Oct 23, 2020
Merged

[Slider] Add sx prop in SliderStyled #23205

merged 89 commits into from
Oct 23, 2020

Commits on Sep 25, 2020

  1. add emotion peer dependencies

    @mnajdova
    mnajdova committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    c2d31cc View commit details
    Browse the repository at this point in the history

  2. fixed types & tests

    @mnajdova
    mnajdova committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    5ae933f View commit details
    Browse the repository at this point in the history

  3. prettier

    @mnajdova
    mnajdova committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    18b0668 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    f0ef95c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    c7bebb8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    92b2d6e View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    13da531 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    cf5d9a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    b8d1291 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    a9d8690 View commit details
    Browse the repository at this point in the history

  2. wip

    @mnajdova
    mnajdova committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    74dc451 View commit details
    Browse the repository at this point in the history

  3. fixed typo

    @mnajdova
    mnajdova committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    688d13a View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    497830a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' of https://github.com/mui-org/material-ui into next

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    d50ea1e View commit details
    Browse the repository at this point in the history

  3. added cross-env

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    a1da207 View commit details
    Browse the repository at this point in the history

  4. yarn lock

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    6ff31f9 View commit details
    Browse the repository at this point in the history

  5. version

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    9fd7f7b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/benchmark-window-fix' into feat/update-box-to-use-… 

    …emotion
    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    e561135 View commit details
    Browse the repository at this point in the history

  7. fixes

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    2a71a6e View commit details
    Browse the repository at this point in the history

  8. prettier

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    77d6017 View commit details
    Browse the repository at this point in the history

  9. removed cross-env dependency

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    a3beed3 View commit details
    Browse the repository at this point in the history

  10. removed unused theme

    @mnajdova
    mnajdova committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    0b2d503 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. reversed style fn

    @mnajdova
    mnajdova committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    eddfa14 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2020

  1. sx wip

    @mnajdova
    mnajdova committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    83e0ea2 View commit details
    Browse the repository at this point in the history

  2. Updated box filterProps

    @mnajdova
    mnajdova committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    ff2d4c3 View commit details
    Browse the repository at this point in the history

  3. prettier

    @mnajdova
    mnajdova committed Oct 8, 2020
    Configuration menu
    Copy the full SHA
    f7a74e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2020

  1. Merge remote-tracking branch 'origin/feat/update-box-to-use-emotion' … 

    …into feat/box-sx-prop
    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    bc55cdb View commit details
    Browse the repository at this point in the history

  2. merge conflicts

    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    72893a9 View commit details
    Browse the repository at this point in the history

  3. cleanup

    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    d596058 View commit details
    Browse the repository at this point in the history

  4. Update docs/src/pages/components/slider-styled/ContinuousSlider.js

    @mnajdova
    mnajdova authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    94c905d View commit details
    Browse the repository at this point in the history

  5. Update docs/src/pages/components/slider-styled/ContinuousSlider.tsx

    @mnajdova
    mnajdova authored Oct 14, 2020
    Configuration menu
    Copy the full SHA
    f179fb9 View commit details
    Browse the repository at this point in the history

  6. updated scenarios to be in the correct benchmark

    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    0373182 View commit details
    Browse the repository at this point in the history

  7. cleaned up benchmark scenarios

    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    6021478 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'feat/box-sx-prop' of https://github.com/mnajdova/materi… 

    …al-ui into feat/box-sx-prop
    @mnajdova
    mnajdova committed Oct 14, 2020
    Configuration menu
    Copy the full SHA
    5a70cf2 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2020

  1. Merge branch 'next' into feat/box-sx-prop

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    92847d7 View commit details
    Browse the repository at this point in the history

  2. fixed typings, updated box page

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    d438191 View commit details
    Browse the repository at this point in the history

  3. moved styleFunction to Box

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    7bab4bd View commit details
    Browse the repository at this point in the history

  4. Update docs/src/pages/components/box/box.md 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    d966402 View commit details
    Browse the repository at this point in the history

  5. Update packages/material-ui-system/src/palette.js 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    76c0f7e View commit details
    Browse the repository at this point in the history

  6. Update packages/material-ui/src/Box/Box.js 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    448bc82 View commit details
    Browse the repository at this point in the history

  7. Update docs/src/pages/components/box/box.md 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 15, 2020
    Configuration menu
    Copy the full SHA
    a7b690d View commit details
    Browse the repository at this point in the history

  8. added support for functions for the values

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    59461b3 View commit details
    Browse the repository at this point in the history

  9. prettier

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    f6faf73 View commit details
    Browse the repository at this point in the history

  10. fixed sizing filterProps

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    c53c4bd View commit details
    Browse the repository at this point in the history

  11. support sx as function

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    ed02098 View commit details
    Browse the repository at this point in the history

  12. prettier

    @mnajdova
    mnajdova committed Oct 15, 2020
    Configuration menu
    Copy the full SHA
    f1ae038 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. implemented breakpoints, fixed types, removed theme function callback

    @mnajdova
    mnajdova committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    d2756c7 View commit details
    Browse the repository at this point in the history

  2. added theme-ui benchmark + sx prop benchmark for the box

    @mnajdova
    mnajdova committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    0f64e53 View commit details
    Browse the repository at this point in the history

  3. fixed custom breakpoints support

    @mnajdova
    mnajdova committed Oct 19, 2020
    Configuration menu
    Copy the full SHA
    b32dd5a View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Update docs/src/pages/components/box/box.md 

    Co-authored-by: Matt <github@nospam.33m.co>
    @mnajdova @mbrookes
    mnajdova and mbrookes authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    79af939 View commit details
    Browse the repository at this point in the history

  2. added theme-ui div scenario benchmark

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    64174a6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feat/box-sx-prop' of https://github.com/mnajdova/materi… 

    …al-ui into feat/box-sx-prop
    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    70c1d51 View commit details
    Browse the repository at this point in the history

  4. improved examples, added chakra-ui box & added results in readme

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    502733e View commit details
    Browse the repository at this point in the history

  5. added tests, fixes

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    49641ac View commit details
    Browse the repository at this point in the history

  6. breakpoints more tests and fixes

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    15b118b View commit details
    Browse the repository at this point in the history

  7. improved breakpoints checks

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    b386b29 View commit details
    Browse the repository at this point in the history

  8. added more examples

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e200326 View commit details
    Browse the repository at this point in the history

  9. Added Box examples

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    e12c35f View commit details
    Browse the repository at this point in the history

  10. temporarly removed dependency

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    d32da87 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'next' into feat/box-sx-prop

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    2d4c5c9 View commit details
    Browse the repository at this point in the history

  12. reverted yarn.lock changes

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    80682d1 View commit details
    Browse the repository at this point in the history

  13. reverted benchmark changes

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    6533c27 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'next' into feat/box-sx-prop

    @mnajdova
    mnajdova authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    5df2f8c View commit details
    Browse the repository at this point in the history

  15. Update benchmark/browser/README.md

    @mnajdova
    mnajdova authored Oct 20, 2020
    Configuration menu
    Copy the full SHA
    3767add View commit details
    Browse the repository at this point in the history

  16. reverted some changes

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    dce99bc View commit details
    Browse the repository at this point in the history

  17. Merge branch 'feat/box-sx-prop' of https://github.com/mnajdova/materi… 

    …al-ui into feat/box-sx-prop
    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    9671da1 View commit details
    Browse the repository at this point in the history

  18. fixed lint & tests

    @mnajdova
    mnajdova committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    b0cc366 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2020

  1. Merge branch 'next' into feat/box-sx-prop

    @mnajdova
    mnajdova committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    0b1ecd5 View commit details
    Browse the repository at this point in the history

  2. fixed breakpoints merging

    @mnajdova
    mnajdova committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    9e3ad18 View commit details
    Browse the repository at this point in the history

  3. prettier

    @mnajdova
    mnajdova committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    2e557d4 View commit details
    Browse the repository at this point in the history

  4. lint

    @mnajdova
    mnajdova committed Oct 21, 2020
    Configuration menu
    Copy the full SHA
    f00fd05 View commit details
    Browse the repository at this point in the history

  5. Update benchmark/browser/scenarios/sx-prop-box-material-ui/index.js

    @mnajdova
    mnajdova authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    43b629d View commit details
    Browse the repository at this point in the history

  6. Update benchmark/browser/scripts/benchmark.js

    @mnajdova
    mnajdova authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    0d57b2d View commit details
    Browse the repository at this point in the history

  7. removed render function code snippet in favor of example

    @mnajdova
    mnajdova authored Oct 21, 2020
    Configuration menu
    Copy the full SHA
    861d4f6 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2020

  1. init

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    85856bc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'next' into feat/slider-add-sx-prop

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    6791fa7 View commit details
    Browse the repository at this point in the history

  3. added tests, updated tests & prettier

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    8457392 View commit details
    Browse the repository at this point in the history

  4. lint

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    5f8c013 View commit details
    Browse the repository at this point in the history

  5. Update packages/material-ui-lab/src/SliderUnstyled/SliderUnstyled.d.ts 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    4881d08 View commit details
    Browse the repository at this point in the history

  6. refactored and added TODO

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    c382d44 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feat/slider-add-sx-prop' of https://github.com/mnajdova… 

    …/material-ui into feat/slider-add-sx-prop
    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    cac4bc3 View commit details
    Browse the repository at this point in the history

  8. Fixed tests

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    3b36beb View commit details
    Browse the repository at this point in the history

  9. fixed this undefined

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    509fb99 View commit details
    Browse the repository at this point in the history

  10. fixed test

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    d7da88b View commit details
    Browse the repository at this point in the history

  11. prettier

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    99b994d View commit details
    Browse the repository at this point in the history

  12. Update packages/material-ui/src/styles/experimentalStyled.test.js 

    Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com>
    @mnajdova @oliviertassinari
    mnajdova and oliviertassinari authored Oct 22, 2020
    Configuration menu
    Copy the full SHA
    61ec4ec View commit details
    Browse the repository at this point in the history

  13. reverted sx examples

    @mnajdova
    mnajdova committed Oct 22, 2020
    Configuration menu
    Copy the full SHA
    ec116cd View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. refactored tests to use container.firstChild

    @mnajdova
    mnajdova committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    3001e90 View commit details
    Browse the repository at this point in the history

  2. prettier

    @mnajdova
    mnajdova committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    af120ff View commit details
    Browse the repository at this point in the history