fixed merge conflicts with develop

Groww-OSS · Feb 15, 2023 · c9f369a · c9f369a
2 parents 1acb115 + f2918b3
commit c9f369a
Show file tree

Hide file tree

Showing 18 changed files with 2,832 additions and 10,029 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ella/package.json b/packages/ella/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@groww-tech/ella",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Ella is a utility-belt library for JavaScript that provides general purpose methods used in day to day programming.",
   "main": "dist/index.js",
   "module": "dist/esm/index.js",
@@ -68,12 +68,12 @@
     "typescript": "^4.5.4"
   },
   "peerDependencies": {
-    "react": "^16.12.0"
+    "react": "^16.12.0 || ^17.0.0"
   },
   "dependencies": {
-    "dayjs": "^1.10.7",
+    "dayjs": "1.10.7",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0",
     "react-helmet": "^6.1.0"
   }
-}
+}
diff --git a/packages/icon-store/package.json b/packages/icon-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@groww-tech/icon-store",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "Icon Library customized for use in Groww",
   "files": [
     "mi",
@@ -65,6 +65,7 @@
     "terser": "^5.9.0"
   },
   "peerDependencies": {
-    "react": "^16.12.0"
+    "react": "^16.12.0 || ^17.0.0",
+    "react-dom": "^16.12.0 || ^17.0.0"
   }
-}
+}
diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
@@ -9,7 +9,6 @@
     "dist",
     "types"
   ],
-
   "sideEffects": false,
   "repository": {
     "type": "git",
@@ -25,16 +24,16 @@
   },
   "homepage": "https://github.com/Groww/webster/tree/develop/packages/react-charts#readme",
   "scripts": {
-      "build": "npm run build:commonjs && npm run build:types",
-      "build:commonjs": "rimraf ./dist && rollup -c",
-      "build:types": "rimraf ./types && tsc --project ./tsconfig.types.json",
-      "watch": "npm run watch:commonjs && npm run watch:types",
-      "watch:commonjs": "rimraf ./dist && cross-env BABEL_ENV=commonjs babel --watch --extensions .ts,.tsx ./src --out-dir dist",
-      "watch:types": "rimraf ./types && tsc --watch --project ./tsconfig.types.json",
-      "now-build": "npm i && npm run build",
-      "start": "npm run watch",
-      "stats": "open ./stats.html",
-      "pushTags": "PACKAGE_VERSION=$(cat package.json | grep \\\"version\\\" | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag -a react-charts-v$PACKAGE_VERSION -m \"@groww-tech/react-charts-v$PACKAGE_VERSION\" && git push --tags"
+    "build": "npm run build:commonjs && npm run build:types",
+    "build:commonjs": "rimraf ./dist && rollup -c",
+    "build:types": "rimraf ./types && tsc --project ./tsconfig.types.json",
+    "watch": "npm run watch:commonjs && npm run watch:types",
+    "watch:commonjs": "rimraf ./dist && cross-env BABEL_ENV=commonjs babel --watch --extensions .ts,.tsx ./src --out-dir dist",
+    "watch:types": "rimraf ./types && tsc --watch --project ./tsconfig.types.json",
+    "now-build": "npm i && npm run build",
+    "start": "npm run watch",
+    "stats": "open ./stats.html",
+    "pushTags": "PACKAGE_VERSION=$(cat package.json | grep \\\"version\\\" | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag -a react-charts-v$PACKAGE_VERSION -m \"@groww-tech/react-charts-v$PACKAGE_VERSION\" && git push --tags"
   },
   "publishConfig": {
     "access": "public"
@@ -103,4 +102,4 @@
     "bar-graph",
     "pie-chart"
   ]
-}
+}
diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@groww-tech/ui-toolkit",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "A lightning nature UI",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -68,8 +68,8 @@
   "peerDependencies": {
     "classnames": "^2.2.6",
     "prop-types": "^15.7.2",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "react": "^16.12.0 || ^17.0.0",
+    "react-dom": "^16.12.0 || ^17.0.0",
     "react-lazyload": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/ui-toolkit/src/components/atoms/Button/Button.tsx b/packages/ui-toolkit/src/components/atoms/Button/Button.tsx
@@ -19,7 +19,8 @@ class Button extends React.PureComponent<Props> {
       isDisabled,
       iconPosition,
       showLoader,
-      loadingText
+      loadingText,
+      dataTestId
     } = this.props;
 
     const classname = cn({
@@ -34,9 +35,10 @@ class Button extends React.PureComponent<Props> {
     });
 
     return (
-      <div className={fixToBottom ? 'btn51BottomFixed' : ''}>
+      <div className={fixToBottom ? 'btn51BottomFixed' : ''} >
         <div
           className={classname}
+          data-test-id={dataTestId.length ? dataTestId : null}
           onClick={this.onButtonClick}
           style={this.getComputedStyle()}
         >
@@ -121,7 +123,8 @@ class Button extends React.PureComponent<Props> {
     loadingText: 'Loading...',
     fontSize: '',
     textColor: '',
-    backgroundColor: ''
+    backgroundColor: '',
+    dataTestId: ''
   }
 }
 
@@ -150,6 +153,7 @@ type DefaultProps = {
   loadingText: string;
   fontSize: string | number;
   textColor: string;
+  dataTestId: string;
   /**
   * What background color to use
   */

diff --git a/packages/ui-toolkit/src/components/atoms/CheckBox/CheckBox.tsx b/packages/ui-toolkit/src/components/atoms/CheckBox/CheckBox.tsx
@@ -16,7 +16,7 @@ const CheckBox = (props: Props) => {
     labelComponent, isChecked,
     handleOnClick, value,
     disabled, checkBoxDirection,
-    addParentClass
+    addParentClass, dataTestId
   } = props;
 
 
@@ -67,7 +67,9 @@ const CheckBox = (props: Props) => {
   );
 
   return (
-    <div onClick={checkBoxClick}
+    <div
+      onClick={checkBoxClick}
+      data-test-id={dataTestId.length ? dataTestId : null}
       className={`c11AlignCenter c11Pointer ${addParentClass} ${checkBoxDirection === CHECKBOX_DIRECTION.RIGHT ? 'c11checkOnRight' : ''}`}
     >
       {isChecked ? active_svg : inactive_svg}
@@ -89,6 +91,7 @@ type DefaultProps = {
   addParentClass: string;
   labelComponent: () => React.ReactNode;
   checkBoxDirection: ValueOf<typeof CHECKBOX_DIRECTION>;
+  dataTestId: string;
 }
 
 
@@ -106,7 +109,8 @@ CheckBox.defaultProps = {
   activeColor: 'var(--secondaryClr)',
   inActiveColor: 'var(--text)',
   labelComponent: () => null,
-  checkBoxDirection: CHECKBOX_DIRECTION.LEFT
+  checkBoxDirection: CHECKBOX_DIRECTION.LEFT,
+  dataTestId: ''
 } as DefaultProps;
 
 export type Props = DefaultProps & RequiredProps;

diff --git a/packages/ui-toolkit/src/components/atoms/InformationBoard/InformationBox.tsx b/packages/ui-toolkit/src/components/atoms/InformationBoard/InformationBox.tsx
@@ -33,7 +33,8 @@ const InformationBox = (props: Props) => {
     iconComponent,
     outlined,
     informationBoxClass,
-    informationBoxStyle
+    informationBoxStyle,
+    dataTestId
   } = props;
 
   const parentDivClass = cn({
@@ -57,9 +58,11 @@ const InformationBox = (props: Props) => {
     className: 'clrText infbd45InfoIcon'
   };
 
+
   return (
     <div style={parentDivStyle}
       className={parentDivClass}
+      data-test-id={dataTestId.length ? dataTestId : null}
     >
       {
         showIcon
@@ -73,7 +76,6 @@ const InformationBox = (props: Props) => {
   );
 };
 
-
 const defaultProps: DefaultProps = {
   showIcon: true,
   iconComponent: (props: ReactIconProps) => <Info {...props} />,
@@ -82,7 +84,8 @@ const defaultProps: DefaultProps = {
   outlined: false,
   type: 'DEFAULT',
   informationBoxClass: '',
-  informationBoxStyle: {}
+  informationBoxStyle: {},
+  dataTestId: ''
 };
 
 
@@ -102,6 +105,7 @@ type DefaultProps = {
   height: number | 'auto';
   informationBoxClass: string;
   informationBoxStyle: React.CSSProperties;
+  dataTestId: string;
   type: 'DEFAULT' | 'POSITIVE' | 'NEUTRAL' | 'ERROR' | 'WARNING';
 }
 

diff --git a/packages/ui-toolkit/src/components/atoms/LaserBeam/LaserBeam.tsx b/packages/ui-toolkit/src/components/atoms/LaserBeam/LaserBeam.tsx
@@ -41,7 +41,8 @@ class LaserBeam extends React.Component<Props, State> {
         width: '0',
         height: props.width,
         background: props.background,
-        transition: 'all 0ms',
+        transitionProperty: 'all',
+        transitionDuration: 0,
         boxShadow: props.noShadow ? 'none' : props.background + ' 0px 0px 10px'
       },
       addonStyle: {
@@ -112,7 +113,8 @@ class LaserBeam extends React.Component<Props, State> {
     if (!show) {
       changedStyle = assign({}, style, {
         width: '0',
-        transition: 'width 0ms'
+        transitionProperty: 'width',
+        transitionDuration: 0
       });
 
       changedAddonStyle = assign({}, addonStyle, {

diff --git a/packages/ui-toolkit/src/components/atoms/Popup/Rodal/Rodal.tsx b/packages/ui-toolkit/src/components/atoms/Popup/Rodal/Rodal.tsx
@@ -104,6 +104,7 @@ class Rodal extends React.Component<Props, State> {
     } = this.props;
 
     const CloseButton = showCloseButton ? <span className="rodal-close"
+      data-test-id='rodal-close-icon'
       onClick={onClose}
     /> : null;
 

diff --git a/packages/ui-toolkit/src/components/atoms/RadioButton/RadioButton.tsx b/packages/ui-toolkit/src/components/atoms/RadioButton/RadioButton.tsx
@@ -20,7 +20,8 @@ const RadioButton = (props: Props) => {
     labelClassName,
     parentClassName,
     iconClassName,
-    radioDirection
+    radioDirection,
+    dataTestId
   } = props;
 
   const labelParentClassName = cn({
@@ -33,6 +34,7 @@ const RadioButton = (props: Props) => {
   return (
     <div
       onClick={onSelect}
+      data-test-id={dataTestId.length ? dataTestId : null}
       className={`radioCo11Box ${parentClassName} ${radioDirection === RADIO_DIRECTION.RIGHT ? 'radioCo11BoxReverse' : ''}`}
     >
       {
@@ -62,6 +64,7 @@ const defaultProps: DefaultProps = {
   iconClassName: '',
   labelClassName: '',
   parentClassName: 'bas11RadioParent',
+  dataTestId: '',
   radioDirection: RADIO_DIRECTION.LEFT
 };
 
@@ -71,6 +74,7 @@ type DefaultProps = {
   parentClassName: string;
   radioDirection: ValueOf<typeof RADIO_DIRECTION>;
   iconClassName: string;
+  dataTestId: string;
 }
 
 

diff --git a/packages/ui-toolkit/src/components/atoms/Select/Select.tsx b/packages/ui-toolkit/src/components/atoms/Select/Select.tsx
@@ -61,7 +61,8 @@ class Select extends React.PureComponent<Props> {
       optionClass,
       optionsParentClass,
       activeOptionBoxClass,
-      activeIndex
+      activeIndex,
+      dataTestId
     } = this.props;
 
     let selectedOption = null;
@@ -78,7 +79,9 @@ class Select extends React.PureComponent<Props> {
         >
           <DropdownTrigger>
             <div className="width100 pos-rel">
-              <div className={`pos-rel valign-wrapper se55SelectBox clrText ${activeOptionBoxClass}`}>
+              <div
+                className={`pos-rel valign-wrapper se55SelectBox clrText ${activeOptionBoxClass}`}
+              >
                 <div>
                   {selectedOption ? selectedOption.label : placeholder}
                 </div>
@@ -93,6 +96,7 @@ class Select extends React.PureComponent<Props> {
                   aria-hidden="true"
                   tabIndex={-1}
                   className="se55Input"
+                  data-test-id={dataTestId.length ? dataTestId : null}
                 />
               </div>
 
@@ -106,6 +110,7 @@ class Select extends React.PureComponent<Props> {
                       <div
                         key={`selectOption-${index}`}
                         ref={this.optionsRefArr[index]}
+                        data-test-id={dataTestId.length ? index + '-' + dataTestId : null}
                         className={
                           cn('se55DropdownPara', {
                             'se55DropdownParaHover': activeIndex === index,
@@ -193,7 +198,8 @@ Select.defaultProps = {
   optionClass: '',
   optionsParentClass: '',
   activeOptionBoxClass: '',
-  onChange: () => {}
+  onChange: () => {},
+  dataTestId: ''
 } as DefaultProps;
 
 
@@ -216,6 +222,7 @@ type DefaultProps = {
   /* class for a box in which selected values is shown */
   activeOptionBoxClass: string;
   onChange:(e:React.ChangeEvent<HTMLInputElement>)=> void;
+  dataTestId: string;
 }
 
 export type Props = RequiredProps & DefaultProps;

diff --git a/packages/ui-toolkit/src/components/atoms/TextInputV1/BaseTextInputV1.tsx b/packages/ui-toolkit/src/components/atoms/TextInputV1/BaseTextInputV1.tsx
@@ -15,6 +15,8 @@ const BaseTextInputV1 = React.forwardRef<HTMLInputElement, TextInputProps>((prop
     variant = 'default',
     size = 'medium',
     label,
+    inputDataTestId = '',
+    errorDataTestId = '',
     PrefixComponent,
     SuffixComponent,
     ...rest
@@ -23,7 +25,9 @@ const BaseTextInputV1 = React.forwardRef<HTMLInputElement, TextInputProps>((prop
   //switch for size
   return (
     <>
-      {label && <Label className='fs14 fw400'>{label}</Label>}
+      {
+        label && <Label className='fs14 fw400'>{label}</Label>
+      }
       <Container
         error={error ? true : false}
         variant={variant}
@@ -32,6 +36,7 @@ const BaseTextInputV1 = React.forwardRef<HTMLInputElement, TextInputProps>((prop
           {PrefixComponent && <TrailingVisContainer variant={variant}>{PrefixComponent()}</TrailingVisContainer>}
           <PrimaryInput
             ref={ref}
+            data-test-id={inputDataTestId.length ? inputDataTestId : null}
             className={calculateInputClass(size)}
             onCopy={onCopy}
             onPaste={onPaste}
@@ -49,6 +54,7 @@ const BaseTextInputV1 = React.forwardRef<HTMLInputElement, TextInputProps>((prop
 
         <ErrorLabel
           className='fs14 fw400'
+          data-test-id={errorDataTestId.length ? errorDataTestId : null}
           error={error ? true : false}
         >
           {error}
@@ -59,6 +65,7 @@ const BaseTextInputV1 = React.forwardRef<HTMLInputElement, TextInputProps>((prop
         <ErrorLabel
           className='fs14 fw400'
           error={error ? true : false}
+          data-test-id={errorDataTestId.length ? errorDataTestId : null}
         >
           {error}
         </ErrorLabel>