Merge pull request #114 from fc5y/qtuan1401/enhance/ContestActionButton

Fix wrong Contest Action Button Dropdown material behaviour
fc5y · Jan 2, 2021 · 66a68c0 · 66a68c0
2 parents d32cf4d + 154d7aa
commit 66a68c0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/app/common-ui/DropdownButton/index.js b/src/app/common-ui/DropdownButton/index.js
@@ -8,7 +8,14 @@ import ClickWrapper from 'src/app/components/ClickWrapper';
 
 import styles from './style.scss';
 
-export function DropDownButton({ className, children, dropList = [], type, ...otherProps }) {
+export function DropDownButton({
+  className,
+  onClickAllMaterials,
+  children,
+  dropList = [],
+  type,
+  ...otherProps
+}) {
   const [showList, setShowList] = React.useState(false);
   const isPrimary = type === 'primary';
 
@@ -18,7 +25,7 @@ export function DropDownButton({ className, children, dropList = [], type, ...ot
         className={cx(styles.dropdownButton, isPrimary && styles.primaryDropdownButton)}
         type="button"
         {...otherProps}
-        onClick={() => setShowList((showList) => !showList)}
+        onClick={onClickAllMaterials}
       >
         {children}
       </button>
@@ -62,6 +69,7 @@ DropDownButton.propTypes = {
   type: PropTypes.string,
   children: PropTypes.node,
   dropList: PropTypes.any,
+  onClickAllMaterials: PropTypes.any,
 };
 
 export function PrimaryDropDownButton(props) {

diff --git a/src/app/components/ContestActionButton/index.js b/src/app/components/ContestActionButton/index.js
@@ -114,9 +114,19 @@ function MaterialButton({ materials, type, buttonWidth }) {
   return (
     <ButtonWrapper buttonWidth={buttonWidth}>
       {type === 'primary' ? (
-        <PrimaryDropDownButton dropList={dropList}>Xem tư liệu kỳ thi</PrimaryDropDownButton>
+        <PrimaryDropDownButton
+          dropList={dropList}
+          onClickAllMaterials={() => openLink(materials.all_materials_url)}
+        >
+          Xem tư liệu kỳ thi
+        </PrimaryDropDownButton>
       ) : (
-        <DropDownButton dropList={dropList}>Xem tư liệu kỳ thi</DropDownButton>
+        <DropDownButton
+          dropList={dropList}
+          onClickAllMaterials={() => openLink(materials.all_materials_url)}
+        >
+          Xem tư liệu kỳ thi
+        </DropDownButton>
       )}
     </ButtonWrapper>
   );