condition added

MenamAfzal · MenamAfzal · commit 8725cf7bdc87 · 2024-09-05T01:29:27.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateComp.tsx
@@ -156,6 +156,7 @@ export type DateCompViewProps = Pick<
   | "minuteStep"
   | "secondStep"
   | "viewRef"
+  | "timeZone"
 > & {
   onFocus: () => void;
   onBlur: () => void;
@@ -187,6 +188,7 @@ export const datePickerControl = new UICompBuilder(childrenMap, (props) => {
     onMouseDown: (e) => e.stopPropagation(),
     children: (
       <DateUIView
+        timeZone={props.timeZone} 
         viewRef={props.viewRef}
         disabledTime={() => disabledTime(props.minTime, props.maxTime)}
         $style={props.inputFieldStyle}
@@ -323,6 +325,7 @@ export const dateRangeControl = (function () {
 
     const children = (
       <DateRangeUIView
+        timeZone={props?.timeZone} 
         viewRef={props.viewRef}
         $style={props.inputFieldStyle}
         disabled={props.disabled}
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateRangeUIView.tsx
@@ -76,13 +76,15 @@ export const DateRangeUIView = (props: DateRangeUIViewProps) => {
       minuteStep={props.minuteStep as any}
       secondStep={props.secondStep as any}
       renderExtraFooter={() => (
-        <StyledDiv>
-          <StyledAntdSelect
-            placeholder="Select Time Zone"
-            options={timeZoneOptions}
-            onChange={()=>{console.log("handleTimeZoneChange")}}
-          />
-        </StyledDiv>
+        props.timeZone === "UserChoice" && (
+          <StyledDiv>
+            <StyledAntdSelect 
+              options={timeZoneOptions} 
+              placeholder="Select Time Zone" 
+              onChange={()=>{console.log("handleTimeZoneChange")}}
+              />
+          </StyledDiv>
+        )
       )}
     />
   );
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/dateUIView.tsx
@@ -63,13 +63,15 @@ export const DateUIView = (props: DataUIViewProps) => {
       inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)}
       placeholder={placeholder}
       renderExtraFooter={()=>(
-        <StyledDiv>
-          <StyledAntdSelect 
-            options={timeZoneOptions} 
-            placeholder="Select a time zone" 
-            onChange={()=>{console.log("DatePickerStyled")}} 
-          />
+        props.timeZone === "UserChoice" && (
+          <StyledDiv>
+            <StyledAntdSelect 
+              options={timeZoneOptions} 
+              placeholder="Select Time Zone" 
+              onChange={()=>{console.log("DatePickerStyled")}} 
+            />
           </StyledDiv>
+        )
       )}
     />
   );
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx
@@ -143,6 +143,7 @@ export type TimeCompViewProps = Pick<
   disabledTime: () => ReturnType<typeof disabledTime>;
   suffixIcon?: ReactNode | false;
   placeholder?: string | [string, string];
+  timeZone:string
 };
 
 export const timePickerControl = new UICompBuilder(childrenMap, (props) => {
@@ -167,6 +168,7 @@ export const timePickerControl = new UICompBuilder(childrenMap, (props) => {
     onMouseDown: (e) => e.stopPropagation(),
     children: (
       <TimeUIView
+        timeZone={props?.timeZone} 
         viewRef={props.viewRef}
         $style={props.inputFieldStyle}
         disabled={props.disabled}
@@ -186,8 +188,7 @@ export const timePickerControl = new UICompBuilder(childrenMap, (props) => {
         }}
         onFocus={() => props.onEvent("focus")}
         onBlur={() => props.onEvent("blur")}
-        suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon}
-      />
+        suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon}      />
     ),
     ...validate(props),
   });
@@ -290,6 +291,7 @@ export const timeRangeControl = (function () {
     
     const children = (
       <TimeRangeUIView
+        timeZone={props?.timeZone} 
         viewRef={props.viewRef}
         $style={props.inputFieldStyle}
         disabled={props.disabled}
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeRangeUIView.tsx
@@ -66,12 +66,14 @@ export const TimeRangeUIView = (props: TimeRangeUIViewProps) => {
       suffixIcon={hasIcon(props.suffixIcon) && props.suffixIcon}
       placeholder={placeholders}
       renderExtraFooter={() => (
-        <StyledAntdSelect
+        props.timeZone === "UserChoice" && (
+          <StyledAntdSelect
           placeholder="Select Time Zone"
           options={timeZoneOptions}
           onChange={()=>{console.log("handleTimeZoneChange")}}
           />
-        )}
+        )
+      )}
     />
   );
 };
diff --git a/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx b/client/packages/lowcoder/src/comps/comps/dateComp/timeUIView.tsx
@@ -48,11 +48,13 @@ export const TimeUIView = (props: TimeUIViewProps) => {
       inputReadOnly={checkIsMobile(editorState?.getAppSettings().maxWidth)}
       placeholder={placeholder}
       renderExtraFooter={()=>(
+      props.timeZone === "UserChoice" && (
         <StyledAntdSelect
           placeholder="Select Time Zone"
           options={timeZoneOptions}
           onChange={()=>{console.log("handleTimeZoneChange")}}
           />
+        )
       )}
     />   
   );
