Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f00e11f
feat(toggle): add new props
liamdebeasi Nov 15, 2022
e616e53
refactor(toggle): add legacy rendering
liamdebeasi Nov 15, 2022
eeec367
chore(): add deprecation warning
liamdebeasi Nov 15, 2022
9c97ab5
feat(toggle): add label slot
liamdebeasi Nov 15, 2022
4de15b9
refactor(): move old tests to legacy directory
liamdebeasi Nov 15, 2022
e2b9324
feat(toggle): add new css variables
liamdebeasi Nov 15, 2022
bd1472d
chore(): naming
liamdebeasi Nov 15, 2022
1dfd86f
chore(): do not use alias to avoid stencil bug
liamdebeasi Nov 16, 2022
83de0eb
chore(): add todo
liamdebeasi Nov 16, 2022
b107f04
chore(): update comment
liamdebeasi Nov 16, 2022
f0cab9b
chore(): lint
liamdebeasi Nov 16, 2022
d7b3a33
chore(): lint again
liamdebeasi Nov 16, 2022
dabcb80
chore(): fix tests
liamdebeasi Nov 16, 2022
4721647
chore(): lint
liamdebeasi Nov 16, 2022
205b709
feat(toggle): add base rendering, justify
liamdebeasi Nov 16, 2022
8353d26
fix(toggle): add min height
liamdebeasi Nov 16, 2022
0d67e1b
fix(toggle): label and toggle are laid out correctly
liamdebeasi Nov 16, 2022
995e26f
fix(toggle): toggle passes a11y checks
liamdebeasi Nov 16, 2022
a7affb5
test(toggle): add axe test
liamdebeasi Nov 16, 2022
8bb922c
fix(toggle): label now overflows correctly
liamdebeasi Nov 16, 2022
4015674
feat(toggle): implement label placement
liamdebeasi Nov 16, 2022
47b21e9
fix(input): inheritance only with moden toggle
liamdebeasi Nov 16, 2022
cdfcb0a
test(toggle): add on/off label test
liamdebeasi Nov 16, 2022
9fc968a
fix(toggle): adjust heights
liamdebeasi Nov 16, 2022
50146b0
test(toggle): begin adding sizes tests
liamdebeasi Nov 16, 2022
b6b2018
chore(): clean up
liamdebeasi Nov 16, 2022
6817aab
chore(): lint
liamdebeasi Nov 16, 2022
fa64d2f
fix(toggle): take up full width in item
liamdebeasi Nov 16, 2022
fba9b3a
test(input): add state template
liamdebeasi Nov 16, 2022
3e09aba
fix(toggle): toggle cannot go offscreen
liamdebeasi Nov 16, 2022
950dd7f
fix(toggle): shadow overflows on ios
liamdebeasi Nov 16, 2022
2b9dc05
chore(): sync with FW-2596
liamdebeasi Nov 17, 2022
4ea4e33
test(toggle): add states test
liamdebeasi Nov 17, 2022
308bbe1
test(toggle): add label placement and justify test
liamdebeasi Nov 17, 2022
ff71ad2
test(toggle): fixed labels show overflow
liamdebeasi Nov 17, 2022
ea42b59
test(toggle): add color tests
liamdebeasi Nov 17, 2022
1883e33
test(input): add item rendering tests
liamdebeasi Nov 17, 2022
0c8e6b5
fix(toggle): shadow rendering on ios is correct
liamdebeasi Nov 17, 2022
fecd18a
chore(): fix test
liamdebeasi Nov 17, 2022
47e4643
chore(): add updated snapshots
Ionitron Nov 17, 2022
5cb2821
fix(toggle): rtl toggle renders correctly in safari
liamdebeasi Nov 17, 2022
1abccd1
Merge branch '2597-label' of https://github.com/ionic-team/ionic-fram…
liamdebeasi Nov 17, 2022
b033c51
Revert "chore(): add updated snapshots"
liamdebeasi Nov 17, 2022
12592b5
chore(): clean up styles
liamdebeasi Nov 17, 2022
5790fa6
chore(): add updated snapshots
Ionitron Nov 17, 2022
1454a60
chore(toggle): remove background vars for now
liamdebeasi Nov 18, 2022
38766e4
chore(): remove correct code
liamdebeasi Nov 18, 2022
a88f5e1
chore(): clean up
liamdebeasi Nov 18, 2022
d273a86
chore(): sync with FW-2597
liamdebeasi Nov 21, 2022
48af2f6
Revert "chore(): add updated snapshots"
liamdebeasi Nov 21, 2022
55d78bb
chore(): add updated snapshots
Ionitron Nov 21, 2022
5337209
chore(): update test
liamdebeasi Nov 21, 2022
7b15235
Revert "chore(): add updated snapshots"
liamdebeasi Nov 21, 2022
9ed276a
chore(): add updated snapshots
Ionitron Nov 21, 2022
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
4 changes: 2 additions & 2 deletions core/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1430,8 +1430,6 @@ ion-toggle,prop,value,null | string | undefined,'on',false,false
ion-toggle,event,ionBlur,void,true
ion-toggle,event,ionChange,ToggleChangeEventDetail<any>,true
ion-toggle,event,ionFocus,void,true
ion-toggle,css-prop,--background
ion-toggle,css-prop,--background-checked
ion-toggle,css-prop,--border-radius
ion-toggle,css-prop,--handle-background
ion-toggle,css-prop,--handle-background-checked
Expand All @@ -1442,6 +1440,8 @@ ion-toggle,css-prop,--handle-max-height
ion-toggle,css-prop,--handle-spacing
ion-toggle,css-prop,--handle-transition
ion-toggle,css-prop,--handle-width
ion-toggle,css-prop,--track-background
ion-toggle,css-prop,--track-background-checked
ion-toggle,part,handle
ion-toggle,part,track

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions core/src/components/toggle/test/legacy/sizes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ <h1>Complex Custom Toggles</h1>
height: 20px;
width: 40px;

--background: #fff;
--background-checked: #0366a6;
--track-background: #fff;
--track-background-checked: #0366a6;
--handle-background: #bbbbbb;
--handle-width: 20px;
--handle-height: 20px;
Expand All @@ -172,7 +172,7 @@ <h1>Complex Custom Toggles</h1>

contain: none;

--background-checked: #d6ffd6;
--track-background-checked: #d6ffd6;

--handle-box-shadow: 0 3px 12px rgba(255, 0, 0, 0.6), 0 3px 1px rgba(50, 70, 255, 0.6);
}
Expand Down
18 changes: 2 additions & 16 deletions core/src/components/toggle/toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

:host {
/**
* @prop --track-background: Background of the toggle
* @prop --track-background-checked: Background of the toggle when checked
* @prop --track-background: Background of the toggle track
* @prop --track-background-checked: Background of the toggle track when checked
* @prop --border-radius: Border radius of the toggle track
*
* @prop --handle-background: Background of the toggle handle
Expand All @@ -19,16 +19,6 @@
* @prop --handle-width: Width of the toggle handle
* @prop --handle-spacing: Horizontal spacing around the toggle handle
* @prop --handle-transition: Transition of the toggle handle
*
* @prop --ripple-color: The color of the ripple effect on MD mode.
*
* @prop --background: The background color of the component.
* @prop --background-activated: Background of component when pressed.
* @prop --background-activated-opacity: Opacity of the component background when pressed.
* @prop --background-hover: Background of component when hovered.
* @prop --background-hover-opacity: Opacity of the component background when hovered.
* @prop --background-focused: Background of component when focused.
* @prop --background-focused-opacity: Opacity of the component background when focused.
*/

/* stylelint-disable-next-line declaration-no-important */
Expand All @@ -48,10 +38,6 @@
z-index: $z-index-item-input;
}

:host(:not(.legacy-toggle)) {
background: var(--background);
}

:host(.in-item:not(.legacy-toggle)) {
width: 100%;
}
Expand Down