Refactor popup logic

cerner · May 17, 2024 · 53e31d9 · 53e31d9
1 parent 7bf9d3a
commit 53e31d9
Show file tree

Hide file tree

Showing 44 changed files with 36 additions and 59 deletions.
diff --git a/...terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap b/...terra-application-navigation/tests/jest/__snapshots__/ApplicationNavigation.test.jsx.snap
@@ -246,7 +246,6 @@ exports[`ApplicationNavigation correctly applies the theme context className 1`]
         isArrowDisplayed={true}
         isContentFocusDisabled={true}
         isHeaderDisabled={true}
-        isMenu={false}
         isOpen={false}
         onRequestClose={[Function]}
         popupContentRole="dialog"
@@ -314,7 +313,6 @@ exports[`ApplicationNavigation should render default element 1`] = `
     isArrowDisplayed={true}
     isContentFocusDisabled={true}
     isHeaderDisabled={true}
-    isMenu={false}
     isOpen={false}
     onRequestClose={[Function]}
     popupContentRole="dialog"
@@ -452,7 +450,6 @@ exports[`ApplicationNavigation should render with prop data at large breakpoint
     isArrowDisplayed={true}
     isContentFocusDisabled={true}
     isHeaderDisabled={true}
-    isMenu={false}
     isOpen={false}
     onRequestClose={[Function]}
     popupContentRole="dialog"
@@ -682,7 +679,6 @@ exports[`ApplicationNavigation should render with prop data at medium breakpoint
     isArrowDisplayed={true}
     isContentFocusDisabled={true}
     isHeaderDisabled={true}
-    isMenu={false}
     isOpen={false}
     onRequestClose={[Function]}
     popupContentRole="dialog"

diff --git a/...terra-application-navigation/tests/jest/extensions/__snapshots__/Extensions.test.jsx.snap b/...terra-application-navigation/tests/jest/extensions/__snapshots__/Extensions.test.jsx.snap
@@ -16,8 +16,7 @@ exports[`Extensions should render default element 1`] = `
     contentWidth="320"
     isArrowDisplayed={true}
     isContentFocusDisabled={true}
-    isHeaderDisabled={true}
-    isMenu={false}
+    isHeaderDisabled={false}
     isOpen={false}
     onRequestClose={[Function]}
     popupContentRole="dialog"
@@ -63,8 +62,7 @@ exports[`Extensions should render prop data 1`] = `
     contentWidth="320"
     isArrowDisplayed={true}
     isContentFocusDisabled={true}
-    isHeaderDisabled={true}
-    isMenu={false}
+    isHeaderDisabled={false}
     isOpen={false}
     onRequestClose={[Function]}
     popupContentRole="dialog"

diff --git a/.../terra-application-navigation/tests/jest/header/__snapshots__/CompactHeader.test.jsx.snap b/.../terra-application-navigation/tests/jest/header/__snapshots__/CompactHeader.test.jsx.snap
@@ -640,8 +640,7 @@ exports[`CompactHeader should render with function callbacks 1`] = `
               contentWidth="320"
               isArrowDisplayed={true}
               isContentFocusDisabled={true}
-              isHeaderDisabled={true}
-              isMenu={false}
+              isHeaderDisabled={false}
               isOpen={false}
               onRequestClose={[Function]}
               popupContentRole="dialog"
@@ -1031,8 +1030,7 @@ exports[`CompactHeader should render with ids for navigation and extension items
               contentWidth="320"
               isArrowDisplayed={true}
               isContentFocusDisabled={true}
-              isHeaderDisabled={true}
-              isMenu={false}
+              isHeaderDisabled={false}
               isOpen={false}
               onRequestClose={[Function]}
               popupContentRole="dialog"

diff --git a/packages/terra-application-navigation/tests/jest/header/__snapshots__/Header.test.jsx.snap b/packages/terra-application-navigation/tests/jest/header/__snapshots__/Header.test.jsx.snap
@@ -912,8 +912,7 @@ exports[`Header should render with function callbacks 1`] = `
               contentWidth="320"
               isArrowDisplayed={true}
               isContentFocusDisabled={true}
-              isHeaderDisabled={true}
-              isMenu={false}
+              isHeaderDisabled={false}
               isOpen={false}
               onRequestClose={[Function]}
               popupContentRole="dialog"
@@ -1731,8 +1730,7 @@ exports[`Header should render with navigation and extension item ids 1`] = `
               contentWidth="320"
               isArrowDisplayed={true}
               isContentFocusDisabled={true}
-              isHeaderDisabled={true}
-              isMenu={false}
+              isHeaderDisabled={false}
               isOpen={false}
               onRequestClose={[Function]}
               popupContentRole="dialog"

diff --git a/packages/terra-date-time-picker/tests/jest/__snapshots__/DateTimePicker.test.jsx.snap b/packages/terra-date-time-picker/tests/jest/__snapshots__/DateTimePicker.test.jsx.snap
@@ -20,6 +20,7 @@ exports[`correctly applies the theme context className 1`] = `
 exports[`renders DateTimePicker with correct ARIA attributes 1`] = `
 <DateTimePicker
   ariaLabel="Enter Date/Time"
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -65,6 +66,7 @@ exports[`renders DateTimePicker with correct ARIA attributes 1`] = `
 
 exports[`should render a date time picker with a default date and time 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -110,6 +112,7 @@ exports[`should render a date time picker with a default date and time 1`] = `
 
 exports[`should render a date time picker with disabled dates 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   excludeDates={
@@ -159,6 +162,7 @@ exports[`should render a date time picker with disabled dates 1`] = `
 
 exports[`should render a date time picker with filtered dates 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   filterDate={[Function]}
@@ -204,6 +208,7 @@ exports[`should render a date time picker with filtered dates 1`] = `
 
 exports[`should render a date time picker with included dates 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   includeDates={
@@ -253,6 +258,7 @@ exports[`should render a date time picker with included dates 1`] = `
 
 exports[`should render a date time picker with min and max dates 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -297,6 +303,7 @@ exports[`should render a date time picker with min and max dates 1`] = `
 
 exports[`should render a date time picker with onBlur 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -342,6 +349,7 @@ exports[`should render a date time picker with onBlur 1`] = `
 
 exports[`should render a date time picker with onChange 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -387,6 +395,7 @@ exports[`should render a date time picker with onChange 1`] = `
 
 exports[`should render a date time picker with onChangeRaw 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -432,6 +441,7 @@ exports[`should render a date time picker with onChangeRaw 1`] = `
 
 exports[`should render a date time picker with the seconds field enabled 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -476,6 +486,7 @@ exports[`should render a date time picker with the seconds field enabled 1`] = `
 
 exports[`should render a default date time picker 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -521,6 +532,7 @@ exports[`should render a default date time picker 1`] = `
 exports[`should render a default date time picker with ariaLabel 1`] = `
 <DateTimePicker
   ariaLabel="Select date and time"
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -570,6 +582,7 @@ exports[`should render a default date time picker with custom date input attribu
       "id": "terra-date-input",
     }
   }
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -614,6 +627,7 @@ exports[`should render a default date time picker with custom date input attribu
 
 exports[`should render a default date time picker with custom time input attributes 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -663,6 +677,7 @@ exports[`should render a default date time picker with custom time input attribu
 
 exports[`should render a disabled date time picker 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={true}
   errorId=""
   initialTimeZone="America/Chicago"
@@ -707,6 +722,7 @@ exports[`should render a disabled date time picker 1`] = `
 
 exports[`should render a error message 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId="default-invalid-error"
   initialTimeZone="America/Chicago"
@@ -751,6 +767,7 @@ exports[`should render a error message 1`] = `
 
 exports[`should render with a default timeVariant if variant is not specified 1`] = `
 <DateTimePicker
+  disableButtonFocusOnClose={false}
   disabled={false}
   errorId=""
   initialTimeZone="America/Chicago"

diff --git a/...ges/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupAttachmentBehavior.jsx b/...ges/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupAttachmentBehavior.jsx
@@ -52,7 +52,6 @@ function PopupAttachmentBehavior() {
         isOpen={open}
         targetRef={getButtonNode}
         onRequestClose={handleRequestClose}
-        isHeaderDisabled={false}
       >
         <Placeholder title="Popup Content" />
       </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupAttachments.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupAttachments.jsx
@@ -71,7 +71,6 @@ function PopupAttachment() {
         isOpen={open}
         targetRef={getButtonNode}
         onRequestClose={handleRequestClose}
-        isHeaderDisabled={false}
       >
         <Placeholder title="Popup Content" />
       </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupBounded.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupBounded.jsx
@@ -48,7 +48,6 @@ function PopupBounded() {
           isOpen={open}
           onRequestClose={handleRequestClose}
           targetRef={getButtonNode}
-          isHeaderDisabled={false}
           isContentFocusDisabled
         >
           <Placeholder title="Popup Content" />

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupDimensions.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupDimensions.jsx
@@ -79,7 +79,6 @@ function PopupDimensions() {
       <div>
         <Popup
           {...contentDimensions}
-          isHeaderDisabled={false}
           classNameContent="test-content"
           isOpen={open}
           onRequestClose={handleRequestClose}

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupModalContent.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupModalContent.jsx
@@ -23,7 +23,6 @@ function ModalContainer(props) {
     <React.Fragment>
       <div className={cx('content-container')}>
         <Popup
-          isHeaderDisabled={false}
           isArrowDisplayed
           isOpen={open}
           onRequestClose={handlePopupRequestClose}

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupStandard.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupStandard.jsx
@@ -37,7 +37,6 @@ function PopupStandard() {
         isOpen={open}
         targetRef={getButtonNode}
         onRequestClose={handleRequestClose}
-        isHeaderDisabled={false}
         isContentFocusDisabled
       >
         <label htmlFor="html">Medications for patient John Doe</label>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupWithArrow.jsx b/packages/terra-framework-docs/src/terra-dev-site/doc/popup/example/PopupWithArrow.jsx
@@ -59,7 +59,6 @@ function PopupArrow() {
       <Button text="Medication Links" onClick={handleButtonClick} refCallback={setButtonNode} />
       <Popup
         isOpen={open}
-        isHeaderDisabled={false}
         onRequestClose={handleRequestClose}
         targetRef={getButtonNode}
         isArrowDisplayed

diff --git a/...erra-framework-docs/src/terra-dev-site/test/compact-interactive-list/CellContent.test.jsx b/...erra-framework-docs/src/terra-dev-site/test/compact-interactive-list/CellContent.test.jsx
@@ -74,7 +74,6 @@ const PopupWithInteractiveContent = () => {
         targetRef={getButtonNode}
         onRequestClose={handleRequestClose}
         contentHeight="auto"
-        isHeaderDisabled={false}
       >
         {/* eslint-disable-next-line react/forbid-dom-props */}
         <div style={{ padding: '1em' }}>

diff --git a/...s/terra-framework-docs/src/terra-dev-site/test/pills/filter-pills/common/PillTemplate.jsx b/...s/terra-framework-docs/src/terra-dev-site/test/pills/filter-pills/common/PillTemplate.jsx
@@ -62,7 +62,7 @@ const PillTemplate = ({
             id={pill.id}
             key={pill.id}
             metaData={{ index }}
-            isPopupHeaderDisabled={false}
+            showPopupHeader
           />
         ))}
       </FilterPills>

diff --git a/...rra-framework-docs/src/terra-dev-site/test/popup/ArrowHorizontalAttachmentsPopup.test.jsx b/...rra-framework-docs/src/terra-dev-site/test/popup/ArrowHorizontalAttachmentsPopup.test.jsx
@@ -66,7 +66,6 @@ class AlignmentPopup extends React.Component {
             isOpen={this.state.open}
             onRequestClose={this.handleRequestClose}
             targetRef={this.getButtonNode}
-            isHeaderDisabled={false}
           >
             <p className={cx('popup-text')}>This popup arrow was horizontally attached.</p>
           </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/popup/ArrowPopup.test.jsx b/packages/terra-framework-docs/src/terra-dev-site/test/popup/ArrowPopup.test.jsx
@@ -46,7 +46,6 @@ class ArrowPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p>this is popup content</p>
         </Popup>

diff --git a/...ges/terra-framework-docs/src/terra-dev-site/test/popup/ArrowSmallTargetLeftPopup.test.jsx b/...ges/terra-framework-docs/src/terra-dev-site/test/popup/ArrowSmallTargetLeftPopup.test.jsx
@@ -65,7 +65,6 @@ class OffsetPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This popup was adjusted because the target was smaller than the arrow position allowed.</p>
         </Popup>

diff --git a/...es/terra-framework-docs/src/terra-dev-site/test/popup/ArrowSmallTargetRightPopup.test.jsx b/...es/terra-framework-docs/src/terra-dev-site/test/popup/ArrowSmallTargetRightPopup.test.jsx
@@ -65,7 +65,6 @@ class OffsetPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This popup was adjusted because the target was smaller than the arrow position allowed.</p>
         </Popup>

diff --git a/...terra-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalAttachmentsPopup.test.jsx b/...terra-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalAttachmentsPopup.test.jsx
@@ -66,7 +66,6 @@ class AlignmentPopup extends React.Component {
             isOpen={this.state.open}
             onRequestClose={this.handleRequestClose}
             targetRef={this.getButtonNode}
-            isHeaderDisabled={false}
           >
             <p className={cx('popup-text')}>This popup arrow has vertical attachment.</p>
           </Popup>

diff --git a/...ra-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalLeftAdjustmentPopup.test.jsx b/...ra-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalLeftAdjustmentPopup.test.jsx
@@ -65,7 +65,6 @@ class AlignmentPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This popup arrow has verital-left attachment, but was adjusted to be on the screen.</p>
         </Popup>

diff --git a/...a-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalRightAdjustmentPopup.test.jsx b/...a-framework-docs/src/terra-dev-site/test/popup/ArrowVerticalRightAdjustmentPopup.test.jsx
@@ -65,7 +65,6 @@ class AlignmentPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This popup arrow has vertical-right attachment, but was adjusted to be on the screen.</p>
         </Popup>

diff --git a/...s/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticHeightBoundedPopup.test.jsx b/...s/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticHeightBoundedPopup.test.jsx
@@ -56,7 +56,6 @@ class PopupExample extends React.Component {
           isOpen={this.state.open}
           targetRef={this.getButtonNode}
           onRequestClose={this.handleRequestClose}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This is popup content with a automatic height of 400px.</p>
         </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticHeightPopup.test.jsx b/packages/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticHeightPopup.test.jsx
@@ -45,7 +45,6 @@ class PopupExample extends React.Component {
           isOpen={this.state.open}
           targetRef={this.getButtonNode}
           onRequestClose={this.handleRequestClose}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This is popup content with a automatic height of 400px.</p>
         </Popup>

diff --git a/...es/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticWidthBoundedPopup.test.jsx b/...es/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticWidthBoundedPopup.test.jsx
@@ -56,7 +56,6 @@ class PopupExample extends React.Component {
           isOpen={this.state.open}
           targetRef={this.getButtonNode}
           onRequestClose={this.handleRequestClose}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This is popup content with a automatic width of 400px, but is bounded by the parent width of 200px.</p>
         </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticWidthPopup.test.jsx b/packages/terra-framework-docs/src/terra-dev-site/test/popup/AutomaticWidthPopup.test.jsx
@@ -45,7 +45,6 @@ class PopupExample extends React.Component {
           isOpen={this.state.open}
           targetRef={this.getButtonNode}
           onRequestClose={this.handleRequestClose}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This is popup content with a automatic width of 400px.</p>
         </Popup>

diff --git a/packages/terra-framework-docs/src/terra-dev-site/test/popup/BoundedHeightPopup.test.jsx b/packages/terra-framework-docs/src/terra-dev-site/test/popup/BoundedHeightPopup.test.jsx
@@ -56,7 +56,6 @@ class BoundedPopup extends React.Component {
           isOpen={this.state.open}
           onRequestClose={this.handleRequestClose}
           targetRef={this.getButtonNode}
-          isHeaderDisabled={false}
         >
           <p className={cx('popup-text')}>This popup is bounded by height.</p>
         </Popup>