Skip to content

Commit

Permalink
fix: format files with prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
falsepopsky committed May 11, 2023
1 parent ba01860 commit deb8ab2
Show file tree
Hide file tree
Showing 21 changed files with 182 additions and 62 deletions.
4 changes: 2 additions & 2 deletions packages/react/src/components/ListBox/ListBoxPropTypes.ts
Expand Up @@ -10,8 +10,8 @@ import PropTypes from 'prop-types';
const listBoxTypes = ['default', 'inline'] as const;
const listBoxSizes = ['sm', 'md', 'lg'] as const;

export type ListBoxType = typeof listBoxTypes[number];
export type ListBoxSize = typeof listBoxSizes[number];
export type ListBoxType = (typeof listBoxTypes)[number];
export type ListBoxSize = (typeof listBoxSizes)[number];

export const ListBoxType = PropTypes.oneOf<ListBoxType>(listBoxTypes);
export const ListBoxSize = PropTypes.oneOf<ListBoxSize>(listBoxSizes);
Expand Up @@ -315,7 +315,9 @@
+ .#{$prefix}--content-switcher-popover__wrapper
.#{$prefix}--content-switcher-btn::before,
.#{$prefix}--content-switcher-btn:hover::before,
.#{$prefix}--content-switcher-popover__wrapper:not(.#{$prefix}--content-switcher-popover--disabled):hover
.#{$prefix}--content-switcher-popover__wrapper:not(
.#{$prefix}--content-switcher-popover--disabled
):hover
+ .#{$prefix}--content-switcher-popover__wrapper
.#{$prefix}--content-switcher-btn::before,
.#{$prefix}--content-switcher--selected::before,
Expand All @@ -337,7 +339,9 @@
}

.#{$prefix}--content-switcher--icon-only
.#{$prefix}--content-switcher-btn[disabled]:not(.#{$prefix}--content-switcher--selected):hover,
.#{$prefix}--content-switcher-btn[disabled]:not(
.#{$prefix}--content-switcher--selected
):hover,
.#{$prefix}--content-switcher--icon-only
.#{$prefix}--content-switcher-popover--selected
+ .#{$prefix}--content-switcher-popover--disabled
Expand Down
16 changes: 12 additions & 4 deletions packages/styles/scss/components/data-table/_data-table.scss
Expand Up @@ -673,8 +673,12 @@
min-height: 3rem;
}

&:not(.#{$prefix}--data-table--xs):not(.#{$prefix}--data-table--xl):not(.#{$prefix}--data-table--sm)
td:not(.#{$prefix}--table-column-menu):not(.#{$prefix}--table-column-checkbox) {
&:not(.#{$prefix}--data-table--xs):not(.#{$prefix}--data-table--xl):not(
.#{$prefix}--data-table--sm
)
td:not(.#{$prefix}--table-column-menu):not(
.#{$prefix}--table-column-checkbox
) {
padding-top: rem(14px);
}

Expand Down Expand Up @@ -741,8 +745,12 @@
border-bottom: 0;
}

th:not(.#{$prefix}--table-column-checkbox):not(.#{$prefix}--table-column-menu):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon),
td:not(.#{$prefix}--table-column-checkbox):not(.#{$prefix}--table-column-menu):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon) {
th:not(.#{$prefix}--table-column-checkbox):not(
.#{$prefix}--table-column-menu
):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon),
td:not(.#{$prefix}--table-column-checkbox):not(
.#{$prefix}--table-column-menu
):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon) {
width: 100%;
min-width: 0;
}
Expand Down
8 changes: 6 additions & 2 deletions packages/styles/scss/components/data-table/_mixins.scss
Expand Up @@ -25,8 +25,12 @@
max-height: $max-height;

@if $min-width {
th:not(.#{$prefix}--table-column-checkbox):not(.#{$prefix}--table-column-menu):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon),
td:not(.#{$prefix}--table-column-checkbox):not(.#{$prefix}--table-column-menu):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon) {
th:not(.#{$prefix}--table-column-checkbox):not(
.#{$prefix}--table-column-menu
):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon),
td:not(.#{$prefix}--table-column-checkbox):not(
.#{$prefix}--table-column-menu
):not(.#{$prefix}--table-expand):not(.#{$prefix}--table-column-icon) {
min-width: $min-width;
}
}
Expand Down
Expand Up @@ -94,7 +94,9 @@
opacity: 0;
}

.#{$prefix}--toolbar-search-container-expandable:not(.#{$prefix}--toolbar-search-container-active)
.#{$prefix}--toolbar-search-container-expandable:not(
.#{$prefix}--toolbar-search-container-active
)
.#{$prefix}--search-input {
padding: 0;
}
Expand Down Expand Up @@ -144,7 +146,9 @@

// sm expandable icon spacing
.#{$prefix}--table-toolbar.#{$prefix}--table-toolbar--sm
.#{$prefix}--search--sm:not(.#{$prefix}--toolbar-search-container-active):not(.#{$prefix}--toolbar-search-container-persistent)
.#{$prefix}--search--sm:not(
.#{$prefix}--toolbar-search-container-active
):not(.#{$prefix}--toolbar-search-container-persistent)
.#{$prefix}--search-magnifier-icon {
left: 0;
}
Expand Down
Expand Up @@ -334,7 +334,9 @@
}

// Parent collapsed hover
tr.#{$prefix}--parent-row.#{$prefix}--data-table--selected:not(.#{$prefix}--expandable-row):hover
tr.#{$prefix}--parent-row.#{$prefix}--data-table--selected:not(
.#{$prefix}--expandable-row
):hover
td {
border-top: 1px solid $layer-selected-hover;
border-bottom: 1px solid $border-subtle;
Expand Down
Expand Up @@ -90,7 +90,9 @@
justify-content: space-between;
}

.#{$prefix}--data-table--sort:not(.#{$prefix}--data-table--xs):not(.#{$prefix}--data-table--sm):not(.#{$prefix}--data-table--md):not(.#{$prefix}--data-table--xl)
.#{$prefix}--data-table--sort:not(.#{$prefix}--data-table--xs):not(
.#{$prefix}--data-table--sm
):not(.#{$prefix}--data-table--md):not(.#{$prefix}--data-table--xl)
th
.#{$prefix}--table-sort__flex {
/* IE11 workaround for align-items: center and min-height
Expand Down
Expand Up @@ -79,7 +79,9 @@

.#{$prefix}--date-picker--fluid
.#{$prefix}--date-picker--simple
.#{$prefix}--date-picker__input:not(.#{$prefix}--date-picker__input--invalid):not(.#{$prefix}--date-picker__input--warn),
.#{$prefix}--date-picker__input:not(
.#{$prefix}--date-picker__input--invalid
):not(.#{$prefix}--date-picker__input--warn),
.#{$prefix}--date-picker--fluid
.#{$prefix}--date-picker--simple
.#{$prefix}--date-picker--fluid--warn {
Expand All @@ -103,15 +105,21 @@

.#{$prefix}--date-picker--fluid
.#{$prefix}--date-picker--single
.#{$prefix}--date-picker__input:not(.#{$prefix}--date-picker__input--invalid),
.#{$prefix}--date-picker__input:not(
.#{$prefix}--date-picker__input--invalid
),
.#{$prefix}--date-picker--single .#{$prefix}--date-picker--fluid--warn {
border-bottom: 1px solid $border-strong;
}

// Range
.#{$prefix}--date-picker--fluid:not(.#{$prefix}--date-picker--fluid--invalid):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--fluid:not(
.#{$prefix}--date-picker--fluid--invalid
):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--range
.#{$prefix}--date-picker-container:not(.#{$prefix}--date-picker--fluid--invalid) {
.#{$prefix}--date-picker-container:not(
.#{$prefix}--date-picker--fluid--invalid
) {
border-bottom: 1px solid $border-strong;
}

Expand Down Expand Up @@ -362,16 +370,22 @@
}

// Readonly
.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(.#{$prefix}--date-picker--fluid--invalid):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(
.#{$prefix}--date-picker--fluid--invalid
):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker
> .#{$prefix}--date-picker-container,
.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(.#{$prefix}--date-picker--fluid--invalid):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(
.#{$prefix}--date-picker--fluid--invalid
):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker
.#{$prefix}--date-picker__input {
border-bottom-color: $border-subtle;
}

.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(.#{$prefix}--date-picker--fluid--invalid):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--fluid.#{$prefix}--date-picker--fluid--readonly:not(
.#{$prefix}--date-picker--fluid--invalid
):not(.#{$prefix}--date-picker--fluid--warn)
.#{$prefix}--date-picker--range
> .#{$prefix}--date-picker-container:last-child
.#{$prefix}--date-picker__input {
Expand Down
Expand Up @@ -71,12 +71,16 @@
height: 1rem;
}

.#{$prefix}--list-box__wrapper--fluid:not(.#{$prefix}--list-box__wrapper--fluid--condensed)
.#{$prefix}--list-box__wrapper--fluid:not(
.#{$prefix}--list-box__wrapper--fluid--condensed
)
.#{$prefix}--list-box__menu-item {
height: $spacing-10;
}

.#{$prefix}--list-box__wrapper--fluid:not(.#{$prefix}--list-box__wrapper--fluid--condensed)
.#{$prefix}--list-box__wrapper--fluid:not(
.#{$prefix}--list-box__wrapper--fluid--condensed
)
.#{$prefix}--list-box__menu-item__selected-icon {
top: rem(20px);
}
Expand Down Expand Up @@ -122,7 +126,9 @@
}

// Invalid / Warning styles
.#{$prefix}--list-box__wrapper--fluid.#{$prefix}--list-box__wrapper--fluid--invalid:not(.#{$prefix}--list-box__wrapper--fluid--focus) {
.#{$prefix}--list-box__wrapper--fluid.#{$prefix}--list-box__wrapper--fluid--invalid:not(
.#{$prefix}--list-box__wrapper--fluid--focus
) {
@include focus-outline('invalid');

z-index: 2;
Expand Down
Expand Up @@ -19,7 +19,9 @@
@use '../fluid-combo-box';

@mixin fluid-multiselect {
.#{$prefix}--multi-select__wrapper.#{$prefix}--list-box__wrapper--fluid--focus:not(.#{$prefix}--multi-select--filterable__wrapper)
.#{$prefix}--multi-select__wrapper.#{$prefix}--list-box__wrapper--fluid--focus:not(
.#{$prefix}--multi-select--filterable__wrapper
)
.#{$prefix}--list-box__field--wrapper--input-focused {
outline: none;
}
Expand Down
Expand Up @@ -84,18 +84,26 @@
}

// Weird overrides (needed to override focus borders on stepper buttons when hovered while input has focus)
.#{$prefix}--number-input--fluid:not(.#{$prefix}--number-input--fluid--invalid)
.#{$prefix}--number-input--fluid:not(
.#{$prefix}--number-input--fluid--invalid
)
.#{$prefix}--number
.#{$prefix}--number__input-wrapper:not(.#{$prefix}--number__input-wrapper--warning)
.#{$prefix}--number__input-wrapper:not(
.#{$prefix}--number__input-wrapper--warning
)
input[type='number']:focus
~ .#{$prefix}--number__controls
.#{$prefix}--number__control-btn:hover {
outline: 2px solid transparent;
}

.#{$prefix}--number-input--fluid:not(.#{$prefix}--number-input--fluid--invalid)
.#{$prefix}--number-input--fluid:not(
.#{$prefix}--number-input--fluid--invalid
)
.#{$prefix}--number
.#{$prefix}--number__input-wrapper:not(.#{$prefix}--number__input-wrapper--warning)
.#{$prefix}--number__input-wrapper:not(
.#{$prefix}--number__input-wrapper--warning
)
input[type='number']:focus
~ .#{$prefix}--number__controls
.#{$prefix}--number__control-btn:hover::before {
Expand All @@ -108,8 +116,12 @@
}
// End weirdness

.#{$prefix}--number-input--fluid:not(.#{$prefix}--number-input--fluid--invalid)
.#{$prefix}--number-input-wrapper:not(.#{$prefix}--number-input-wrapper__warning)
.#{$prefix}--number-input--fluid:not(
.#{$prefix}--number-input--fluid--invalid
)
.#{$prefix}--number-input-wrapper:not(
.#{$prefix}--number-input-wrapper__warning
)
input[type='number']:focus
~ .#{$prefix}--number__controls
.#{$prefix}--number__control-btn:hover {
Expand Down Expand Up @@ -208,7 +220,9 @@
margin: 0;
}

.#{$prefix}--number-input--fluid.#{$prefix}--number-input--fluid--invalid:not(.#{$prefix}--number-input--fluid--focus)
.#{$prefix}--number-input--fluid.#{$prefix}--number-input--fluid--invalid:not(
.#{$prefix}--number-input--fluid--focus
)
.#{$prefix}--number {
@include focus-outline('invalid');
}
Expand Down Expand Up @@ -263,7 +277,9 @@
}

// Disabled states
.#{$prefix}--number-input--fluid--disabled:not(.#{$prefix}--number-input--fluid--invalid)
.#{$prefix}--number-input--fluid--disabled:not(
.#{$prefix}--number-input--fluid--invalid
)
.#{$prefix}--number {
border-bottom: 1px solid $border-subtle;
}
Expand Down
4 changes: 3 additions & 1 deletion packages/styles/scss/components/form/_form.scss
Expand Up @@ -125,7 +125,9 @@ $input-label-weight: 400 !default;
> .#{$prefix}--text-area--invalid:not(:focus),
.#{$prefix}--select-input__wrapper[data-invalid]
.#{$prefix}--select-input:not(:focus),
.#{$prefix}--list-box[data-invalid]:not(.#{$prefix}--multi-select--invalid--focused),
.#{$prefix}--list-box[data-invalid]:not(
.#{$prefix}--multi-select--invalid--focused
),
.#{$prefix}--combo-box[data-invalid]:not(.#{$prefix}--multi-select--selected)
.#{$prefix}--text-input:not(:focus) {
@include focus-outline('invalid');
Expand Down
Expand Up @@ -95,7 +95,9 @@
padding-left: 0;
}

.#{$prefix}--multi-select--filterable.#{$prefix}--list-box--disabled:hover:not(.#{$prefix}--multi-select--filterable)
.#{$prefix}--multi-select--filterable.#{$prefix}--list-box--disabled:hover:not(
.#{$prefix}--multi-select--filterable
)
.#{$prefix}--text-input {
background-color: $field;
}
Expand Down

0 comments on commit deb8ab2

Please sign in to comment.