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

fix: delete uikit overrides #105

Merged
merged 2 commits into from
Sep 11, 2023
Merged

fix: delete uikit overrides #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9152cad
feat: refactor Search
NikitaCG Aug 24, 2023
7f36e59
feat: refactor few select popup overrides
NikitaCG Aug 25, 2023
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
91 changes: 0 additions & 91 deletions src/components/ButtonWithIcon/ButtonWithIcon.scss
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions src/components/ButtonWithIcon/ButtonWithIcon.tsx
View file
Open in desktop

This file was deleted.

41 changes: 6 additions & 35 deletions src/components/FeedHeader/components/Controls/Controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ $block: '.#{$namespace}feed-controls';
&__search {
width: 100%;
max-width: 100%;

.yc-text-input_view_normal .yc-text-input__control {
border-color: var(--g-color-base-background);
}
}

&__select {
Expand All @@ -52,11 +48,6 @@ $block: '.#{$namespace}feed-controls';
max-height: $popupMaxHeight;
border-radius: $selectorContainerBorderRadius;

// TODO delete this section after Select can customize the popup list
.g-select-filter + .g-select-list {
margin-top: 0;
}

.g-select-list {
overflow: scroll;

Expand All @@ -75,38 +66,18 @@ $block: '.#{$namespace}feed-controls';
margin: 4px;
border-radius: $selectorItemBorderRadius;
}

.yc-text-input__content {
padding: 4px;

border: none;

border-bottom: 1px solid var(--yc-color-line-generic);
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;

.yc-text-input__control.yc-text-input__control_type_input {
border: none;
}
}

.g-select-list_size_xl .g-select-list__option {
padding: 0 $indentXS;
}
}
}

&__popup-filter {
.yc-text-input__control {
@include text-size(body-2);
@include text-size(body-2);
padding: 4px 12px;

border: none;
border: none;

&:hover,
&:focus {
border: none;
}
}
border-bottom: 1px solid var(--yc-color-line-generic);
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}

&__select:hover {
Expand Down
1 change: 1 addition & 0 deletions src/components/FeedHeader/components/Controls/Controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ export const Controls: React.FC<ControlsProps> = ({
size="xl"
multiple
filterable
hasClear
disablePortal
options={services}
defaultValue={servicesItems}
Expand Down
20 changes: 10 additions & 10 deletions src/components/FeedHeader/components/Controls/customRenders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ export const renderSwitcher: RenderSwitcherType =
);

export const renderFilter: SelectProps['renderFilter'] = ({value, ref, onChange, onKeyDown}) => (
<div className={b('popup-filter')}>
<TextInput
controlRef={ref}
controlProps={{size: 1}}
value={value}
placeholder={i18(Keyset.Search)}
onUpdate={onChange}
onKeyDown={onKeyDown}
/>
</div>
<TextInput
controlRef={ref}
controlProps={{size: 1}}
value={value}
view="clear"
placeholder={i18(Keyset.Search)}
onUpdate={onChange}
onKeyDown={onKeyDown}
className={b('popup-filter')}
/>
);

export const renderOption = (option: SelectOption) => (
Expand Down
34 changes: 15 additions & 19 deletions src/components/Search/Search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,37 @@ $block: '.#{$namespace}search';
align-items: center;
justify-content: flex-end;

height: $searchHeight;

transition: width 0.3s;

&__close-button,
&__search-button {
position: absolute;
z-index: 2;

right: 10px;
&__input-icon {
display: flex;
padding-right: 7px;
color: var(--g-color-text-hint);
cursor: pointer;
}

&__search-button:hover {
color: var(--g-color-text-secondary);
}
&__search-suggest {
display: flex;
align-items: center;

&__search-suggest-container {
width: 100%;
}
height: $searchHeight;

#{$block} &__search-suggest-control {
background-color: var(--g-color-base-background);
padding-left: $indentXXS;
padding-right: $indentM;
border-radius: var(--bc-text-input-border-radius);

border: 1px solid transparent;
border-radius: var(--bc-text-input-border-radius);
border: 1px solid var(--g-color-base-background);

&:hover,
&:focus {
border: 1px solid var(--g-color-base-generic-hover);
}
}

#{$block} &__search-suggest-control {
padding-left: $indentXXS;
padding-right: $indentM;
}

&_size_s {
--bc-text-input-border-radius: var(--g-border-radius-l);

Expand Down
Loading