@gisce/react-ooui 1.4.2 → 1.4.3

package/dist/widgets/custom/Tag.d.ts

@@ -1,5 +1,7 @@
 import React from "react";
 import { WidgetProps } from '../../types';
+import { TagProps } from 'antd';
 export declare const Tag: (props: WidgetProps) => React.JSX.Element;
 export declare const TagInput: (props: any) => React.JSX.Element | null;
+export declare const CustomTag: (props: TagProps) => React.JSX.Element;
 //# sourceMappingURL=Tag.d.ts.map

package/dist/widgets/custom/Tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["Tag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,eAAO,MAAM,GAAG,UAAW,WAAW,sBAMrC,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,GAAG,6BAiBlC,CAAA"}
+{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["Tag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAkB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAIhD,eAAO,MAAM,GAAG,UAAW,WAAW,sBAMrC,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,GAAG,6BAiBlC,CAAA;AAGD,eAAO,MAAM,SAAS,UAAW,QAAQ,sBAaxC,CAAA"}

package/dist/widgets/custom/Tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,sBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,sBAoI9C,CAAC"}
+{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["Tags.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAQ7E,aAAK,SAAS,GAAG,WAAW,GAAG;IAC7B,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,aAAK,cAAc,GAAG,SAAS,GAAG;IAChC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C,CAAC;AAEF,eAAO,MAAM,IAAI,UAAW,SAAS,sBAQpC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,sBAoI9C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "files": [
     "dist",
     "src",

package/src/helpers/formHelper.ts

@@ -295,11 +295,3 @@ export const colorTextFromBackground = (color: string) => {
   return getTextColor(color);
 
 }
-
-export const colorsFromString = (text: string): any => {
-  const backgroundColor = colorFromString(text)
-  return {
-    backgroundColor,
-    textColor: colorTextFromBackground(backgroundColor)
-  }
-}

package/src/stories/Utils.stories.tsx

@@ -0,0 +1,16 @@
+// @ts-ignore
+import React from "react";
+import { CustomTag } from "../widgets/custom/Tag";
+import { colorFromString } from "../helpers/formHelper";
+
+export default {
+  title: "Components/Pure",
+};
+
+
+
+export const CustomTagWithColor = (): React.ReactElement => {
+  const text = "Hacker";
+  const color = colorFromString(text);
+  return <CustomTag color={color}>{text}</CustomTag>
+};

package/src/widgets/custom/Tag.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import Field from "@/common/Field";
 import { WidgetProps } from "@/types";
-import { Tag as AntdTag } from 'antd';
-import { isPresetStatusColor } from 'antd/lib/_util/colors'
-import { colorFromString, colorTextFromBackground } from "@/helpers/formHelper";
+import { Tag as AntdTag, TagProps } from 'antd';
+import { isPresetStatusColor, isPresetColor } from 'antd/lib/_util/colors'
+import { colorFromString } from "@/helpers/formHelper";
 
 export const Tag = (props: WidgetProps) => {
   return (
@@ -28,6 +28,22 @@ export const TagInput = (props: any) => {
   }
   const color = ooui.colors === "auto" ? colorFromString(colorValue) : ooui.colors[colorValue] || colorFromString(colorValue);
   return (
-    <AntdTag color={color} style={isPresetStatusColor(color) ? {} : {color: colorTextFromBackground(color)}}>{formattedValue}</AntdTag>
+    <CustomTag color={color}>{formattedValue}</CustomTag>
   );
-}
+}
+
+
+export const CustomTag = (props: TagProps) => {
+  let { color } = props;
+  let style = {}
+  if (!isPresetStatusColor(props.color) && !isPresetColor(props.color)) {
+    style = {
+      color: color,
+      borderColor: color,
+      borderStyle: "solid",
+      borderWidth: "1px",
+    }
+    color = `${color}20`;
+  }
+  return <AntdTag {...props} style={style} color={color}>{props.children}</AntdTag>
+}

package/src/widgets/custom/Tags.tsx

@@ -5,9 +5,10 @@ import { WidgetProps } from "@/types";
 import { One2manyItem, One2manyValue } from "../base/one2many/One2manyInput";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
-import { Alert, Tag as AntTag, Select } from "antd";
-import { colorsFromString, transformPlainMany2Ones } from "@/helpers/formHelper";
+import { Alert, Select } from "antd";
+import { colorFromString, transformPlainMany2Ones } from "@/helpers/formHelper";
 import ConnectionProvider from "@/ConnectionProvider";
+import { CustomTag } from "@/widgets/custom/Tag";
 
 type TagsProps = WidgetProps & {
   ooui: TagsOoui;
@@ -126,17 +127,17 @@ export const TagsInput = (props: TagsInputProps) => {
       event.preventDefault();
       event.stopPropagation();
     };
-    const colors = colorsFromString(label);
+    const color = colorFromString(label);
     return (
-      <AntTag
-        color={colors.backgroundColor}
+      <CustomTag
+        color={color}
         onMouseDown={onPreventMouseDown}
-        style={{ margin: "5px", color: colors.textColor }}
         closable={closable}
         onClose={onClose}
+        closeIcon={<span style={{color}}>X</span>}
       >
         {label}
-      </AntTag>
+      </CustomTag>
     );
   };