From c372b101ddf64b22a1a17fa88ec7359cf97de933 Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 6 Dec 2019 11:23:45 +0200
Subject: [PATCH] MetaItem onSelect dropped

---
 src/common/MetaItem/MetaItem.js               | 58 +++++-----------
 src/common/MetaItem/styles.less               | 69 +++++++++----------
 .../MetaItem/SаmpleMetaItem/SаmpleMetaItem.js |  5 +-
 3 files changed, 52 insertions(+), 80 deletions(-)

diff --git a/src/common/MetaItem/MetaItem.js b/src/common/MetaItem/MetaItem.js
index d4c0939a5..2f699051c 100644
--- a/src/common/MetaItem/MetaItem.js
+++ b/src/common/MetaItem/MetaItem.js
@@ -17,28 +17,11 @@ const ICON_FOR_TYPE = new Map([
     ['other', 'ic_movies']
 ]);
 
-const MetaItem = React.memo(({ className, type, name, poster, posterShape, playIcon, progress, menuOptions, dataset, onSelect, menuOptionOnSelect, ...props }) => {
+const MetaItem = React.memo(({ className, type, name, poster, posterShape, playIcon, progress, options, dataset, ...props }) => {
     const [menuOpen, onMenuOpen, onMenuClose] = useBinaryState(false);
-    const metaItemOnClick = React.useCallback((event) => {
-        if (typeof props.onClick === 'function') {
-            props.onClick(event);
-        }
-
-        if (!event.nativeEvent.selectMetaItemPrevented && typeof onSelect === 'function') {
-            onSelect({
-                type: 'select',
-                dataset: dataset,
-                reactEvent: event,
-                nativeEvent: event.nativeEvent
-            });
-        }
-    }, [props.onClick, onSelect, dataset]);
-    const multiselectOnClick = React.useCallback((event) => {
-        event.nativeEvent.selectMetaItemPrevented = true;
-    }, []);
-    const multiselectOnSelect = React.useCallback((event) => {
-        if (typeof menuOptionOnSelect === 'function') {
-            menuOptionOnSelect({
+    const optionOnSelect = React.useCallback((event) => {
+        if (typeof props.optionOnSelect === 'function') {
+            props.optionOnSelect({
                 type: 'select-option',
                 value: event.value,
                 dataset: dataset,
@@ -46,18 +29,18 @@ const MetaItem = React.memo(({ className, type, name, poster, posterShape, playI
                 nativeEvent: event.nativeEvent
             });
         }
-    }, [menuOptionOnSelect, dataset]);
+    }, [dataset, props.optionOnSelect]);
     const renderPosterFallback = React.useMemo(() => () => (
         <Icon
             className={styles['placeholder-icon']}
             icon={ICON_FOR_TYPE.has(type) ? ICON_FOR_TYPE.get(type) : ICON_FOR_TYPE.get('other')}
         />
     ), [type]);
-    const renderMenuOptionsLabelContent = React.useMemo(() => () => (
+    const renderMenuLabelContent = React.useMemo(() => () => (
         <Icon className={styles['icon']} icon={'ic_more'} />
     ), []);
     return (
-        <Button title={name} {...props} className={classnames(className, styles['meta-item-container'], styles['poster-shape-poster'], styles[`poster-shape-${posterShape}`], { 'active': menuOpen })} onClick={metaItemOnClick}>
+        <Button title={name} {...props} className={classnames(className, styles['meta-item-container'], styles['poster-shape-poster'], styles[`poster-shape-${posterShape}`], { 'active': menuOpen })}>
             <div className={styles['poster-container']}>
                 <div className={styles['poster-image-layer']}>
                     <Image
@@ -85,7 +68,7 @@ const MetaItem = React.memo(({ className, type, name, poster, posterShape, playI
                 }
             </div>
             {
-                (typeof name === 'string' && name.length > 0) || (Array.isArray(menuOptions) && menuOptions.length > 0) ?
+                (typeof name === 'string' && name.length > 0) || (Array.isArray(options) && options.length > 0) ?
                     <div className={styles['title-bar-container']}>
                         {
                             typeof name === 'string' && name.length > 0 ?
@@ -94,17 +77,15 @@ const MetaItem = React.memo(({ className, type, name, poster, posterShape, playI
                                 null
                         }
                         {
-                            Array.isArray(menuOptions) && menuOptions.length > 0 ?
-                                <div className={styles['multiselect-container']} onClick={multiselectOnClick}>
-                                    <Multiselect
-                                        className={styles['multiselect-label-container']}
-                                        renderLabelContent={renderMenuOptionsLabelContent}
-                                        options={menuOptions}
-                                        onOpen={onMenuOpen}
-                                        onClose={onMenuClose}
-                                        onSelect={multiselectOnSelect}
-                                    />
-                                </div>
+                            Array.isArray(options) && options.length > 0 ?
+                                <Multiselect
+                                    className={styles['menu-label-container']}
+                                    renderLabelContent={renderMenuLabelContent}
+                                    options={options}
+                                    onOpen={onMenuOpen}
+                                    onClose={onMenuClose}
+                                    onSelect={optionOnSelect}
+                                />
                                 :
                                 null
                         }
@@ -126,10 +107,9 @@ MetaItem.propTypes = {
     posterShape: PropTypes.oneOf(['poster', 'landscape', 'square']),
     playIcon: PropTypes.bool,
     progress: PropTypes.number,
-    menuOptions: PropTypes.array,
+    options: PropTypes.array,
     dataset: PropTypes.objectOf(String),
-    onSelect: PropTypes.func,
-    menuOptionOnSelect: PropTypes.func
+    optionOnSelect: PropTypes.func
 };
 
 module.exports = MetaItem;
diff --git a/src/common/MetaItem/styles.less b/src/common/MetaItem/styles.less
index eb5d750f6..7d2797b51 100644
--- a/src/common/MetaItem/styles.less
+++ b/src/common/MetaItem/styles.less
@@ -41,11 +41,9 @@
                 color: var(--color-backgrounddarker);
             }
 
-            .multiselect-container {
-                .multiselect-label-container {
-                    .icon {
-                        fill: var(--color-backgrounddarker);
-                    }
+            .menu-label-container {
+                .icon {
+                    fill: var(--color-backgrounddarker);
                 }
             }
         }
@@ -162,50 +160,45 @@
             }
         }
 
-        .multiselect-container {
+
+        .menu-label-container {
             flex: none;
             width: 2.8rem;
             height: 2.8rem;
-            overflow: visible;
+            padding: 0.75rem;
+            background-color: transparent;
 
-            .multiselect-label-container {
+            &:hover, &:global(.active) {
+                background-color: var(--color-surface80);
+            }
+
+            .icon {
+                display: block;
                 width: 100%;
                 height: 100%;
-                padding: 0.75rem;
-                background-color: transparent;
+                fill: var(--color-surfacelighter);
+            }
 
-                &:hover, &:global(.active) {
-                    background-color: var(--color-surface80);
-                }
+            .popup-menu-container {
+                width: auto;
+                right: initial;
+                left: 0;
 
-                .icon {
-                    display: block;
-                    width: 100%;
-                    height: 100%;
-                    fill: var(--color-surfacelighter);
-                }
+                .multiselect-menu-container {
+                    min-width: 8rem;
+                    max-width: 12rem;
 
-                .popup-menu-container {
-                    width: auto;
-                    right: initial;
-                    left: 0;
+                    .multiselect-option-container {
+                        padding: 0.5rem;
+                        background-color: var(--color-surfacelighter);
 
-                    .multiselect-menu-container {
-                        min-width: 8rem;
-                        max-width: 12rem;
+                        &:hover, &:focus {
+                            outline: none;
+                            background-color: var(--color-surfacelight);
+                        }
 
-                        .multiselect-option-container {
-                            padding: 0.5rem;
-                            background-color: var(--color-surfacelighter);
-
-                            &:hover, &:focus {
-                                outline: none;
-                                background-color: var(--color-surfacelight);
-                            }
-
-                            .multiselect-option-label {
-                                color: var(--color-backgrounddarker);
-                            }
+                        .multiselect-option-label {
+                            color: var(--color-backgrounddarker);
                         }
                     }
                 }
diff --git a/storybook/stories/MetaItem/SаmpleMetaItem/SаmpleMetaItem.js b/storybook/stories/MetaItem/SаmpleMetaItem/SаmpleMetaItem.js
index dc3b84ff2..73d7aa16c 100644
--- a/storybook/stories/MetaItem/SаmpleMetaItem/SаmpleMetaItem.js
+++ b/storybook/stories/MetaItem/SаmpleMetaItem/SаmpleMetaItem.js
@@ -28,10 +28,9 @@ storiesOf('MetaItem', module).add('SаmpleMetaItem', () => {
             posterShape={'poster'}
             playIcon={true}
             progress={0.4}
-            menuOptions={CONTINUE_WATCHING_MENU}
+            options={CONTINUE_WATCHING_MENU}
             dataset={{ id: 'pt1' }}
-            onSelect={action('onSelect')}
-            menuOptionOnSelect={action('menuOptionOnSelect')}
+            optionOnSelect={action('optionOnSelect')}
             data-id={'meta-item-id'}
             onClick={domEventHandler}
         />