Merge branch 'main' of https://github.com/MaTeMaTuK/gantt-task-react
Conflicts: src/helpers/date-helper.ts
This commit is contained in:
commit
ea132a4a41
6 files changed
+86
-71
No files matched your search
@@ -3,7 +3,10 @@ import styles from "./task-list-table.module.css";
|
||||
import { Task } from "../../types/public-types";
|
||||
|
||||
const localeDateStringCache = {};
|
||||
const toLocaleDateStringFactory = (locale: string) => (date: Date, dateTimeOptions: Intl.DateTimeFormatOptions) => {
|
||||
const toLocaleDateStringFactory = (locale: string) => (
|
||||
date: Date,
|
||||
dateTimeOptions: Intl.DateTimeFormatOptions
|
||||
) => {
|
||||
const key = date.toString();
|
||||
let lds = localeDateStringCache[key];
|
||||
if (!lds) {
|
||||
@@ -12,6 +15,12 @@ const toLocaleDateStringFactory = (locale: string) => (date: Date, dateTimeOptio
|
||||
}
|
||||
return lds;
|
||||
};
|
||||
const dateTimeOptions: Intl.DateTimeFormatOptions = {
|
||||
weekday: "short",
|
||||
year: "numeric",
|
||||
month: "long",
|
||||
day: "numeric",
|
||||
};
|
||||
|
||||
export const TaskListTableDefault: React.FC<{
|
||||
rowHeight: number;
|
||||
@@ -32,13 +41,9 @@ export const TaskListTableDefault: React.FC<{
|
||||
locale,
|
||||
onExpanderClick,
|
||||
}) => {
|
||||
const dateTimeOptions: Intl.DateTimeFormatOptions = {
|
||||
weekday: "short",
|
||||
year: "numeric",
|
||||
month: "long",
|
||||
day: "numeric",
|
||||
};
|
||||
const toLocaleDateString = useMemo(() => toLocaleDateStringFactory(locale), [locale]);
|
||||
const toLocaleDateString = useMemo(() => toLocaleDateStringFactory(locale), [
|
||||
locale,
|
||||
]);
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -108,4 +113,3 @@ export const TaskListTableDefault: React.FC<{
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -12,7 +12,10 @@ type DateHelperScales =
|
||||
| "millisecond";
|
||||
|
||||
const intlDTCache = {};
|
||||
export const getCachedDateTimeFormat = (locString: string | string[], opts: DateTimeFormatOptions = {}): DateTimeFormat => {
|
||||
export const getCachedDateTimeFormat = (
|
||||
locString: string | string[],
|
||||
opts: DateTimeFormatOptions = {}
|
||||
): DateTimeFormat => {
|
||||
const key = JSON.stringify([locString, opts]);
|
||||
let dtf = intlDTCache[key];
|
||||
if (!dtf) {
|
||||
|
||||
Reference in new issue
Block a user