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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(item-option): add styling for slots other than icon-only #17711

Merged
merged 15 commits into from Mar 15, 2019
Merged

fix(item-option): add styling for slots other than icon-only #17711

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bf70520
fix(item-option): add styling for slots other than icon-only
brandyscarney Mar 7, 2019
acb4433
fix(item-option): set the display and box sizing for anchors
brandyscarney Mar 8, 2019
5f65da6
Merge branch 'master' into docs-item-sliding
brandyscarney Mar 11, 2019
07b7571
docs(item-sliding): update usage information for frameworks
brandyscarney Mar 11, 2019
62907f8
chore(docs): update readme from build
brandyscarney Mar 11, 2019
6498999
test(item-sliding): update standalone test to take more SS
brandyscarney Mar 11, 2019
28495a4
test(item-sliding): add anchor option to SS
brandyscarney Mar 11, 2019
b3010cd
test(item-sliding): update standalone
brandyscarney Mar 15, 2019
cac9b3b
test(item-sliding): fix the drag event
brandyscarney Mar 15, 2019
860101e
style(test): updates capitalization on screenshotCompares
brandyscarney Mar 15, 2019
d5a701e
test(item-sliding): get interactive test working locally
brandyscarney Mar 15, 2019
e055236
Merge branch 'master' into docs-item-sliding
brandyscarney Mar 15, 2019
fa67bd2
test(item-sliding): add a timeout for the open item
brandyscarney Mar 15, 2019
6f1c7d3
Merge branch 'master' into docs-item-sliding
brandyscarney Mar 15, 2019
a900811
Merge branch 'master' into docs-item-sliding
brandyscarney Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 28 additions & 2 deletions core/src/components/item-option/item-option.scss
View file
Open in desktop
Expand Up @@ -38,6 +38,8 @@
@include text-inherit();
@include padding(0, .7em);

display: inline-block;

position: relative;

width: 100%;
Expand All @@ -51,13 +53,14 @@

cursor: pointer;
appearance: none;

box-sizing: border-box;
}

.button-inner {
display: flex;

flex-direction: column;
flex-flow: row nowrap;
flex-flow: column nowrap;
flex-shrink: 0;
align-items: center;
justify-content: center;
Expand All @@ -66,6 +69,29 @@
height: 100%;
}

.horizontal-wrapper {
display: flex;

flex-flow: row nowrap;
flex-shrink: 0;
align-items: center;
justify-content: center;

width: 100%;
}

::slotted(*) {
flex-shrink: 0;
}

::slotted([slot="start"]) {
@include margin(0, 5px, 0, 0);
}

::slotted([slot="end"]) {
@include margin(0, 0, 0, 5px);
}

::slotted([slot="icon-only"]) {
@include padding(0);
@include margin(0, 10px);
Expand Down
14 changes: 8 additions & 6 deletions core/src/components/item-option/item-option.tsx
View file
Open in desktop
Expand Up @@ -80,12 +80,14 @@ export class ItemOption implements ComponentInterface {
href={this.href}
>
<span class="button-inner">
<slot name="start"></slot>
<slot name="top" />
<slot name="icon-only" />
<slot></slot>
<slot name="bottom" />
<slot name="end"></slot>
<slot name="top"></slot>
<div class="horizontal-wrapper">
<slot name="start"></slot>
<slot name="icon-only"></slot>
<slot></slot>
<slot name="end"></slot>
</div>
<slot name="bottom"></slot>
</span>
{this.mode === 'md' && <ion-ripple-effect></ion-ripple-effect>}
</TagType>
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/item-sliding/item-sliding.tsx
View file
Open in desktop
Expand Up @@ -319,10 +319,10 @@ export class ItemSliding implements ComponentInterface {

function swipeShouldReset(isResetDirection: boolean, isMovingFast: boolean, isOnResetZone: boolean): boolean {
// The logic required to know when the sliding item should close (openAmount=0)
// depends on three booleans (isCloseDirection, isMovingFast, isOnCloseZone)
// depends on three booleans (isResetDirection, isMovingFast, isOnResetZone)
// and it ended up being too complicated to be written manually without errors
// so the truth table is attached below: (0=false, 1=true)
// isCloseDirection | isMovingFast | isOnCloseZone || shouldClose
// isResetDirection | isMovingFast | isOnResetZone || shouldClose
// 0 | 0 | 0 || 0
// 0 | 0 | 1 || 1
// 0 | 1 | 0 || 0
Expand Down