@trackunit/react-date-and-time-components 1.6.13 → 1.7.0

package/index.cjs.js

@@ -4,12 +4,11 @@ var jsxRuntime = require('react/jsx-runtime');
 var i18nLibraryTranslation = require('@trackunit/i18n-library-translation');
 var dateAndTimeUtils = require('@trackunit/date-and-time-utils');
 var reactDateAndTimeHooks = require('@trackunit/react-date-and-time-hooks');
-var uiDesignTokens = require('@trackunit/ui-design-tokens');
 var react = require('react');
+var tailwindMerge = require('tailwind-merge');
 var reactComponents = require('@trackunit/react-components');
 var sharedUtils = require('@trackunit/shared-utils');
 var Calendar = require('react-calendar');
-var tailwindMerge = require('tailwind-merge');
 var reactFormComponents = require('@trackunit/react-form-components');
 var cssClassVarianceUtilities = require('@trackunit/css-class-variance-utilities');
 var stringTs = require('string-ts');
@@ -123,7 +122,7 @@ const DateTime = ({ value, format, className, fromNow, withTitle, titleFormat, t
     const dateValue = react.useMemo(() => {
         return fromNow ? getTimeSince(date, nowDate) : newDateTime;
     }, [date, fromNow, getTimeSince, newDateTime, nowDate]);
-    return (jsxRuntime.jsx("time", { className: className, dateTime: newDateTime, style: subtle ? { color: uiDesignTokens.color("NEUTRAL", 600, "CSS") } : undefined, title: titleDateTime, children: dateValue }));
+    return (jsxRuntime.jsx("time", { className: className || subtle ? tailwindMerge.twMerge(subtle ? "text-neutral-600" : undefined, className) : undefined, dateTime: newDateTime, title: titleDateTime, children: dateValue }));
 };
 
 /**

package/index.esm.js

@@ -2,12 +2,11 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { registerTranslations, useNamespaceTranslation } from '@trackunit/i18n-library-translation';
 import { toDateUtil, formatDateUtil, isEqualUtil, timeSinceAuto, getHourCycle } from '@trackunit/date-and-time-utils';
 import { useLocale, useDateAndTime } from '@trackunit/react-date-and-time-hooks';
-import { color } from '@trackunit/ui-design-tokens';
 import { useMemo, useCallback, useState, useEffect, useRef, Children, isValidElement } from 'react';
+import { twMerge } from 'tailwind-merge';
 import { Tooltip, Button, MenuItem, Icon, Popover, PopoverTrigger, PopoverContent, MenuList, MenuDivider, Card, Text } from '@trackunit/react-components';
 import { DateTimeFormat, nonNullable, objectKeys } from '@trackunit/shared-utils';
 import Calendar from 'react-calendar';
-import { twMerge } from 'tailwind-merge';
 import { Search } from '@trackunit/react-form-components';
 import { cvaMerge } from '@trackunit/css-class-variance-utilities';
 import { lowerCase } from 'string-ts';
@@ -121,7 +120,7 @@ const DateTime = ({ value, format, className, fromNow, withTitle, titleFormat, t
     const dateValue = useMemo(() => {
         return fromNow ? getTimeSince(date, nowDate) : newDateTime;
     }, [date, fromNow, getTimeSince, newDateTime, nowDate]);
-    return (jsx("time", { className: className, dateTime: newDateTime, style: subtle ? { color: color("NEUTRAL", 600, "CSS") } : undefined, title: titleDateTime, children: dateValue }));
+    return (jsx("time", { className: className || subtle ? twMerge(subtle ? "text-neutral-600" : undefined, className) : undefined, dateTime: newDateTime, title: titleDateTime, children: dateValue }));
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-date-and-time-components",
-  "version": "1.6.13",
+  "version": "1.7.0",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -8,16 +8,15 @@
   },
   "dependencies": {
     "react": "19.0.0",
-    "@trackunit/react-components": "1.5.22",
-    "@trackunit/react-date-and-time-hooks": "1.4.20",
+    "@trackunit/react-components": "1.5.23",
     "@trackunit/date-and-time-utils": "1.4.15",
+    "@trackunit/react-date-and-time-hooks": "1.4.20",
     "@trackunit/css-class-variance-utilities": "1.4.15",
     "@trackunit/ui-icons": "1.4.15",
-    "@trackunit/ui-design-tokens": "1.4.17",
     "@trackunit/shared-utils": "1.6.15",
     "@trackunit/i18n-library-translation": "1.4.20",
     "@trackunit/react-test-setup": "1.1.15",
-    "@trackunit/react-form-components": "1.4.26",
+    "@trackunit/react-form-components": "1.4.27",
     "string-ts": "^2.0.0",
     "tailwind-merge": "^2.0.0",
     "react-calendar": "^6.0.0"