fix: remove ghost prop for form elements, #641

taskany-inc · Feb 28, 2023 · e844f84 · e844f84
1 parent 5c0f17c
commit e844f84
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/src/components/EstimateComboBox.tsx b/src/components/EstimateComboBox.tsx
@@ -23,7 +23,7 @@ import { Input } from './Input';
 const ComboBox = dynamic(() => import('./ComboBox'));
 
 interface EstimateComboBoxProps {
-    text: React.ComponentProps<typeof Button>['text'];
+    text?: React.ComponentProps<typeof Button>['text'];
     mask: string;
     value?: {
         date: string;
@@ -110,7 +110,7 @@ const createValue = (date: string | Date, locale: TLocale) => {
 };
 
 export const EstimateComboBox = React.forwardRef<HTMLDivElement, EstimateComboBoxProps>(
-    ({ text, value, defaultValuePlaceholder, placeholder, mask, disabled, error, onChange }, ref) => {
+    ({ text = '', value, defaultValuePlaceholder, placeholder, mask, disabled, error, onChange }, ref) => {
         const { locale } = usePageContext();
         const inputVal = parseLocaleDate(value?.date || defaultValuePlaceholder?.date, { locale });
         const [inputState, setInputState] = useState(inputVal ? createLocaleDate(inputVal, { locale }) : '');
@@ -176,6 +176,7 @@ export const EstimateComboBox = React.forwardRef<HTMLDivElement, EstimateComboBo
                 value={value}
                 disabled={disabled}
                 error={error}
+                placement="top-start"
                 items={['Q1', 'Q2', 'Q3', 'Q4']}
                 maxWidth={100}
                 minWidth={100}
@@ -184,7 +185,6 @@ export const EstimateComboBox = React.forwardRef<HTMLDivElement, EstimateComboBo
                     <StyledTriggerContainer>
                         {changed && <StyledCleanButton onClick={onCleanClick}>+</StyledCleanButton>}
                         <Button
-                            ghost
                             disabled={props.disabled}
                             ref={props.ref}
                             text={buttonText}

diff --git a/src/components/GoalParentComboBox.tsx b/src/components/GoalParentComboBox.tsx
@@ -115,10 +115,11 @@ export const GoalParentComboBox = React.forwardRef<HTMLDivElement, GoalParentCom
                 visible={completionVisible}
                 error={error}
                 disabled={disabled}
+                placement="top-start"
                 items={items}
                 onChange={onChange}
                 renderTrigger={(props) => (
-                    <Button ghost disabled={props.disabled} ref={props.ref} text={props.text} onClick={props.onClick} />
+                    <Button disabled={props.disabled} ref={props.ref} text={props.text} onClick={props.onClick} />
                 )}
                 renderInput={(props) => (
                     <StyledInput

diff --git a/src/components/PriorityDropdown.tsx b/src/components/PriorityDropdown.tsx
@@ -54,7 +54,6 @@ export const PriorityDropdown = React.forwardRef<HTMLDivElement, PriorityDropdow
                 renderTrigger={(props) => (
                     <Button
                         ref={props.ref}
-                        ghost
                         onClick={props.onClick}
                         disabled={props.disabled}
                         iconLeft={

diff --git a/src/components/ReactionsButton.tsx b/src/components/ReactionsButton.tsx
@@ -33,7 +33,6 @@ export const ReactionsButton = React.memo(
 
         return (
             <StyledButton
-                ghost
                 ref={ref}
                 text={count && count > 1 ? String(count) : undefined}
                 iconLeft={

diff --git a/src/components/StateDropdown.tsx b/src/components/StateDropdown.tsx
@@ -81,7 +81,6 @@ export const StateDropdown = React.forwardRef<HTMLDivElement, StateDropdownProps
                 disabled={!flowId || disabled}
                 renderTrigger={(props) => (
                     <Button
-                        ghost
                         ref={props.ref}
                         text={props.text}
                         onClick={props.onClick}

diff --git a/src/components/TagComboBox.tsx b/src/components/TagComboBox.tsx
@@ -19,7 +19,7 @@ import { Input } from './Input';
 const ComboBox = dynamic(() => import('./ComboBox'));
 
 interface TagComboBoxProps {
-    text: React.ComponentProps<typeof Button>['text'];
+    text?: React.ComponentProps<typeof Button>['text'];
     query?: string;
     value?: Array<Partial<TagModel>>;
     disabled?: boolean;
@@ -124,7 +124,6 @@ export const TagComboBox = React.forwardRef<HTMLDivElement, TagComboBoxProps>(
                 items={items}
                 renderTrigger={(props) => (
                     <Button
-                        ghost
                         ref={props.ref}
                         text={props.text}
                         disabled={props.disabled}

diff --git a/src/components/UserComboBox.tsx b/src/components/UserComboBox.tsx
@@ -72,11 +72,11 @@ export const UserComboBox = React.forwardRef<HTMLDivElement, UserComboBoxProps>(
                 visible={completionVisible}
                 disabled={disabled}
                 error={error}
+                placement="top-start"
                 items={data?.findActivity}
                 onChange={onChange}
                 renderTrigger={(props) => (
                     <Button
-                        ghost
                         ref={props.ref}
                         text={props.text}
                         disabled={props.disabled}