From 8ac55a51c2971885ca672177b54b8bda355ef333 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Fri, 22 Dec 2023 18:32:49 +0300 Subject: [PATCH] Shared:Components: fix bugs --- .../components/ColorTheme/styled/calendar.ts | 19 ---------- .../components/ColorTheme/styled/dateItem.ts | 36 ------------------- .../ColorTheme/styled/roundButton.ts | 25 ------------- .../access-right-select/AccessRightSelect.tsx | 6 ++-- 4 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 packages/components/ColorTheme/styled/calendar.ts delete mode 100644 packages/components/ColorTheme/styled/dateItem.ts delete mode 100644 packages/components/ColorTheme/styled/roundButton.ts diff --git a/packages/components/ColorTheme/styled/calendar.ts b/packages/components/ColorTheme/styled/calendar.ts deleted file mode 100644 index 558ee03089..0000000000 --- a/packages/components/ColorTheme/styled/calendar.ts +++ /dev/null @@ -1,19 +0,0 @@ -import styled, { css } from "styled-components"; -import { - Container, - // @ts-expect-error TS(2305): Module '"../../calendar/styled-components"' has no... Remove this comment to see the full error message - CurrentDateItem, - HeaderActionIcon, -} from "../../calendar/styled-components"; - -const getDefaultStyles = ({ - $currentColorScheme -}: any) => - $currentColorScheme && - css` - ${HeaderActionIcon} { - border-color: ${$currentColorScheme.main.accent}; - } - `; - -export default styled(Container)(getDefaultStyles); diff --git a/packages/components/ColorTheme/styled/dateItem.ts b/packages/components/ColorTheme/styled/dateItem.ts deleted file mode 100644 index 910fff061e..0000000000 --- a/packages/components/ColorTheme/styled/dateItem.ts +++ /dev/null @@ -1,36 +0,0 @@ -import styled, { css } from "styled-components"; -import { DateItem } from "../../calendar/styled-components"; - -const getDefaultStyles = ({ - $currentColorScheme -}: any) => - $currentColorScheme && - css` - ${(props) => - // @ts-expect-error TS(2339): Property 'isCurrent' does not exist on type 'Theme... Remove this comment to see the full error message - props.isCurrent && - css` - background: ${$currentColorScheme.main.accent}; - :hover { - background-color: ${$currentColorScheme.main.accent}; - } - - :focus { - background-color: ${$currentColorScheme.main.accent}; - } - `} - color: ${(props) => - // @ts-expect-error TS(2339): Property 'disabled' does not exist on type 'Themed... Remove this comment to see the full error message - props.disabled - ? props.theme.calendar.disabledColor - // @ts-expect-error TS(2339): Property 'focused' does not exist on type 'ThemedS... Remove this comment to see the full error message - : props.focused - ? $currentColorScheme.main.accent - : props.theme.calendar.color}; - border-color: ${(props) => - // @ts-expect-error TS(2339): Property 'focused' does not exist on type 'ThemedS... Remove this comment to see the full error message - props.focused ? $currentColorScheme.main.accent : "transparent"}; - `; - - -export default styled(DateItem)(getDefaultStyles); diff --git a/packages/components/ColorTheme/styled/roundButton.ts b/packages/components/ColorTheme/styled/roundButton.ts deleted file mode 100644 index 501251b382..0000000000 --- a/packages/components/ColorTheme/styled/roundButton.ts +++ /dev/null @@ -1,25 +0,0 @@ -import styled, { css } from "styled-components"; -import { RoundButton } from "../../calendar/styled-components"; - -const getDefaultStyles = ({ - $currentColorScheme -}: any) => - $currentColorScheme && - css` - :hover { - outline: ${(props) => - // @ts-expect-error TS(2339): Property 'disabled' does not exist on type 'ThemeP... Remove this comment to see the full error message - props.disabled - ? `1px solid ${props.theme.calendar.outlineColor}` - : `2px solid ${$currentColorScheme.main.accent}`}; - span { - border-color: ${(props) => - // @ts-expect-error TS(2339): Property 'disabled' does not exist on type 'ThemeP... Remove this comment to see the full error message - props.disabled - ? props.theme.calendar.disabledArrow - : $currentColorScheme.main.accent}; - } - } - `; - -export default styled(RoundButton)(getDefaultStyles); diff --git a/packages/shared/components/access-right-select/AccessRightSelect.tsx b/packages/shared/components/access-right-select/AccessRightSelect.tsx index 16f3303055..dc87d3d574 100644 --- a/packages/shared/components/access-right-select/AccessRightSelect.tsx +++ b/packages/shared/components/access-right-select/AccessRightSelect.tsx @@ -47,7 +47,7 @@ export const AccessRightSelectPure = ({ className="access-right-item" key={item.key} data-key={item.key} - // onClick={onSelectCurrentItem} + onClick={() => onSelectCurrentItem(item)} > {item.icon && } @@ -70,12 +70,14 @@ export const AccessRightSelectPure = ({ ); }); - return { items }; + return items; }; const formattedOptions = advancedOptions || formatToAccessRightItem(accessOptions); + // console.log(formattedOptions); + return (