Merge pull request #3901 from carbon-design-system/datetimepicker-fly…

…out-footerissue DateTimePicker FlyoutMenu Footer Button issue fixed
carbon-design-system · Dec 9, 2024 · 8fb1ad2 · 8fb1ad2
2 parents 0059baf + ec09096
commit 8fb1ad2
Show file tree

Hide file tree

Showing 5 changed files with 157 additions and 122 deletions.
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -173,15 +173,15 @@
   "dependencies": {
     "@babel/plugin-transform-optional-chaining": "^7.24.7",
     "@babel/runtime": "^7.25.6",
-    "@carbon/charts": "^1.22.0",
-    "@carbon/charts-react": "^1.22.0",
-    "@carbon/colors": "^11.23.1",
-    "@carbon/icons-react": "^11.52.0",
-    "@carbon/layout": "^11.23.1",
-    "@carbon/pictograms-react": "^11.63.1",
-    "@carbon/react": "^1.70.0",
+    "@carbon/charts": "^1.22.7",
+    "@carbon/charts-react": "^1.22.7",
+    "@carbon/colors": "^11.28.0",
+    "@carbon/icons-react": "^11.53.0",
+    "@carbon/layout": "^11.28.0",
+    "@carbon/pictograms-react": "^11.69.0",
+    "@carbon/react": "^1.72.0",
     "@carbon/telemetry": "^0.1.0",
-    "@carbon/themes": "^11.42.0",
+    "@carbon/themes": "^11.43.0",
     "@codemirror/lang-css": "^6.3.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",

diff --git a/packages/react/src/components/DateTimePicker/DateTimePickerV2WithTimeSpinner.jsx b/packages/react/src/components/DateTimePicker/DateTimePickerV2WithTimeSpinner.jsx
@@ -1036,7 +1036,6 @@ const DateTimePicker = ({
         }}
         testId={`${testId}-datepicker-flyout`}
         direction={direction}
-        customFooter={() => {}}
         tooltipFocusTrap={false}
         renderInPortal={renderInPortal}
         useAutoPositioning={false}

diff --git a/packages/react/src/components/DateTimePicker/DateTimePickerV2WithoutTimeSpinner.jsx b/packages/react/src/components/DateTimePicker/DateTimePickerV2WithoutTimeSpinner.jsx
@@ -779,7 +779,6 @@ const DateTimePicker = ({
         }}
         testId={`${testId}-datepicker-flyout`}
         direction={direction}
-        customFooter={() => {}}
         tooltipFocusTrap={false}
         renderInPortal={renderInPortal}
         useAutoPositioning={false}

diff --git a/packages/react/src/components/FlyoutMenu/FlyoutMenu.jsx b/packages/react/src/components/FlyoutMenu/FlyoutMenu.jsx
@@ -245,6 +245,8 @@ const FlyoutMenu = ({
 
   const Footer = CustomFooter ? (
     <CustomFooter setIsOpen={setIsOpen} isOpen={isControlledOpen} />
+  ) : testId?.endsWith('-datepicker-flyout') === true ? (
+    ''
   ) : (
     <DefaultFooter setIsOpen={setIsOpen} onCancel={onCancel} onApply={onApply} i18n={i18n} />
   );