Browse Source

Merge branch 'fix/app-final-2' into 'master'

FIX | update filter user,taxonomies selectors & date picker layouts

See merge request jetup/rws/rws-appication!377
master
Coder 2 years ago
parent
commit
4391c37eec
  1. 1
      src/modules/tasks/hooks/use-task-filter.hook.ts
  2. 5
      src/modules/taxonomies/smart-components/select-taxonomies-modal/index.tsx
  3. 5
      src/modules/users/smart-components/select-user-modal/index.tsx

1
src/modules/tasks/hooks/use-task-filter.hook.ts

@ -97,6 +97,7 @@ export const useTaskFilter = ({ onSubmit, ...props }: IProps) => {
defaultValue: values[key] ? values[key] : new Date(), defaultValue: values[key] ? values[key] : new Date(),
onClose: selectedDate => onClose: selectedDate =>
onSelect<DateKeysEnum>(key, selectedDate || minValue), onSelect<DateKeysEnum>(key, selectedDate || minValue),
mode: 'date',
}) })
} }

5
src/modules/taxonomies/smart-components/select-taxonomies-modal/index.tsx

@ -267,10 +267,11 @@ const createStyles = (theme: PartialTheme) =>
marginLeft: 10, marginLeft: 10,
fontSize: $size(16), fontSize: $size(16),
textAlign: 'left', textAlign: 'left',
opacity: 0.5, opacity: 1,
color: theme?.$textPrimary, color: theme?.$textPrimary,
}, },
itemTextActive: { itemTextActive: {
opacity: 1, // opacity: 1,
fontWeight: '600',
}, },
}) })

5
src/modules/users/smart-components/select-user-modal/index.tsx

@ -259,10 +259,11 @@ const createStyles = (theme: PartialTheme) =>
marginLeft: 10, marginLeft: 10,
fontSize: $size(16), fontSize: $size(16),
textAlign: 'left', textAlign: 'left',
opacity: 0.5, opacity: 1,
color: theme.$textPrimary, color: theme.$textPrimary,
}, },
itemTextActive: { itemTextActive: {
opacity: 1, // opacity: 1,
fontWeight: '600',
}, },
}) })

Loading…
Cancel
Save