Skip to content

Fix shortcuts types #133

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

Merged
onesine merged 2 commits into from
May 17, 2023
Merged

Fix shortcuts types #133

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
653b684
Fix custom shortcuts types
t0m3k May 14, 2023
b946333
Simplify the shortcuts logic
t0m3k May 14, 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
1 change: 1 addition & 0 deletions react-tailwindcss-datepicker
Open in desktop
Submodule react-tailwindcss-datepicker added at 21e1da
67 changes: 31 additions & 36 deletions src/components/Shortcuts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,46 +91,41 @@ const Shortcuts: React.FC = () => {
}, []);

const shortcutOptions = useMemo<[string, ShortcutsItem | ShortcutsItem[]][]>(() => {
let options;
if (configs?.shortcuts && configs?.shortcuts) {
const formatConfig = Object.keys(configs.shortcuts).map(item => {
const options: [string, ShortcutsItem | ShortcutsItem[]][] = [];
if (configs && configs.shortcuts) {
Object.keys(configs.shortcuts).forEach(item => {
if (Object.keys(DEFAULT_SHORTCUTS).includes(item)) {
return [item, DEFAULT_SHORTCUTS[item]];
} else {
// using | makes this fail in typecheck as [string] is no longer recognised?
if (configs.shortcuts && configs?.shortcuts[item]) {
const customConfig = configs?.shortcuts[item];
const text = customConfig?.text;
const start = dayjs(customConfig?.period?.start);
const end = dayjs(customConfig?.period?.end);
if (
text &&
start.isValid() &&
end.isValid() &&
(start.isBefore(end) || start.isSame(end))
) {
return [
item,
{
text,
period: {
start: start.format(DATE_FORMAT),
end: end.format(DATE_FORMAT)
}
}
];
} else {
return undefined;
}
}
return undefined;
options.push([item, DEFAULT_SHORTCUTS[item]]);
}
});
options = formatConfig?.filter(item => !!item);
if (configs.shortcuts.custom && configs.shortcuts.custom.length > 0) {
configs.shortcuts.custom.forEach(customConfig => {
const text = customConfig.text;
const start = dayjs(customConfig.period.start);
const end = dayjs(customConfig.period.end);
if (
text &&
start.isValid() &&
end.isValid() &&
(start.isBefore(end) || start.isSame(end))
) {
options.push([
text,
{
text,
period: {
start: start.format(DATE_FORMAT),
end: end.format(DATE_FORMAT)
}
}
]);
}
});
}
} else {
options = Object.entries(DEFAULT_SHORTCUTS);
return Object.entries(DEFAULT_SHORTCUTS);
}
return options as [string, ShortcutsItem | ShortcutsItem[]][];
return options;
}, [configs]);

const printItemText = useCallback((item: ShortcutsItem) => {
Expand All @@ -140,7 +135,7 @@ const Shortcuts: React.FC = () => {
return shortcutOptions?.length ? (
<div className="md:border-b mb-3 lg:mb-0 lg:border-r lg:border-b-0 border-gray-300 dark:border-gray-700 pr-1">
<ul className="w-full tracking-wide flex flex-wrap lg:flex-col pb-1 lg:pb-0">
{shortcutOptions?.map(([key, item], index: number) =>
{shortcutOptions.map(([key, item], index: number) =>
Array.isArray(item) ? (
item.map((item, index) => (
<ItemTemplate key={index} item={item}>
Expand Down
24 changes: 13 additions & 11 deletions src/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,28 @@ export interface Period {
end: string | null;
}

interface DefaultShortcuts {
today?: string;
yesterday?: string;
past?: (period: number) => string;
currentMonth?: string;
pastMonth?: string;
custom?: ShortcutsItem[];
}
export interface Configs {
shortcuts?: {
today?: string;
yesterday?: string;
past?: (period: number) => string;
currentMonth?: string;
pastMonth?: string;
} & { [key: string]: ShortcutsItem };
shortcuts?: DefaultShortcuts;
footer?: {
cancel?: string;
apply?: string;
};
}

export interface ShortcutsItem {
text?: string;
text: string;
daysNumber?: number;
period?: {
start: string;
end: string;
period: {
start: Date | string;
end: Date | string;
};
}

Expand Down