From 56e3b8287a333e82c5c742cc5f04d843c31fff37 Mon Sep 17 00:00:00 2001
From: Boaz Shuster <boaz.shuster.github@gmail.com>
Date: Tue, 18 Dec 2018 15:20:06 +0200
Subject: [PATCH] fix(DataList): Add dropdown and button actions to DataList

Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>
---
 .../src/components/DataList/DataList.docs.js  |  5 ++
 .../src/components/DataList/DataList.test.js  | 34 ++++++--
 .../components/DataList/DataListAction.d.ts   |  3 +-
 .../src/components/DataList/DataListAction.js | 57 +++++++++++---
 .../__snapshots__/DataList.test.js.snap       | 78 +++++++++++++++++++
 .../DataList/examples/ActionsDataList.js      | 72 +++++++++++++++++
 6 files changed, 234 insertions(+), 15 deletions(-)
 create mode 100644 packages/patternfly-4/react-core/src/components/DataList/examples/ActionsDataList.js

diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataList.docs.js b/packages/patternfly-4/react-core/src/components/DataList/DataList.docs.js
index df86525e4ae..65c54f6761a 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataList.docs.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataList.docs.js
@@ -11,6 +11,7 @@ import Simple from './examples/SimpleDataList';
 import CheckboxAction from './examples/CheckboxActionDataList';
 import Expandable from './examples/ExpandableDataList';
 import Modifiers from './examples/ModifiersDataList';
+import Actions from './examples/ActionsDataList';
 
 export default {
   title: 'DataList',
@@ -33,6 +34,10 @@ export default {
       component: CheckboxAction,
       title: 'Data List Checkboxes, Actions and Additional Cells'
     },
+    {
+      component: Actions,
+      title: 'Data List Actions: single and multiple'
+    },
     {
       component: Expandable,
       title: 'Data List Expandable'
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js b/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
index 928e0acb124..0801a620393 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
@@ -2,9 +2,11 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import DataList from './DataList';
 import DataListItem from './DataListItem';
+import DataListAction from './DataListAction';
 import DataListCell from './DataListCell';
 import DataListToggle from './DataListToggle';
 import { Button } from '../Button';
+import { DropdownItem } from '../Dropdown';
 
 describe('DataList', () => {
   test('List default', () => {
@@ -78,13 +80,35 @@ describe('DataList', () => {
   });
 
   test('Toggle expanded', () => {
+    const view = shallow(<DataListToggle aria-label="Toggle details for" id="ex-toggle2" isExpanded />);
+    expect(view.find(Button).props()['aria-expanded']).toBe(true);
+  });
+
+  test('DataListAction dropdown', () => {
     const view = shallow(
-      <DataListToggle
-        aria-label="Toggle details for"
-        id="ex-toggle2"
-        isExpanded
+      <DataListAction
+        aria-label="Actions"
+        aria-labelledby="ex-action"
+        id="ex-action"
+        actions={[
+          <DropdownItem component="button" onClick={jest.fn()} key="action-1">
+            action-1
+          </DropdownItem>,
+          <DropdownItem component="button" onClick={jest.fn()} key="action-2">
+            action-2
+          </DropdownItem>
+        ]}
       />
     );
-    expect(view.find(Button).props()['aria-expanded']).toBe(true);
+    expect(view).toMatchSnapshot();
+  });
+
+  test('DataListAction button', () => {
+    const view = shallow(
+      <DataListAction aria-label="Actions" aria-labelledby="ex-action" id="ex-action">
+        <Button id="delete-item-1">Delete</Button>
+      </DataListAction>
+    );
+    expect(view).toMatchSnapshot();
   });
 });
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.d.ts b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.d.ts
index a41e88f211b..9ac6fd597c6 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.d.ts
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.d.ts
@@ -1,9 +1,10 @@
-import { FunctionComponent, HTMLProps } from 'react';
+import { FunctionComponent, HTMLProps, ReactNode } from 'react';
 
 export interface DataListActionProps extends HTMLProps<HTMLDivElement> {
   'aria-labelledby': string;
   'aria-label': string;
   id: string;
+  actions: ReactNode[];
 }
 
 declare const DataListAction: FunctionComponent<DataListActionProps>;
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
index d3a36409c3e..a14bca29525 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
@@ -2,22 +2,61 @@ import React from 'react';
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
-import { EllipsisVIcon } from '@patternfly/react-icons';
-import { Button, ButtonVariant } from '../Button';
+import { Dropdown, DropdownPosition, KebabToggle } from '../Dropdown';
 
-const DataListAction = ({ className, id, 'aria-label': ariaLabel, 'aria-labelledby': ariaLabelledBy, rowid, ...props }) => (
-  <div className={css(styles.dataListAction, className)} {...props}>
-    <Button variant={ButtonVariant.plain} id={id} aria-labelledby={ariaLabelledBy} aria-label={ariaLabel}>
-      <EllipsisVIcon />
-    </Button>
-  </div>
-);
+class DataListAction extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isOpen: false
+    };
+  }
+
+  onToggle = isOpen => {
+    this.setState({ isOpen });
+  };
+
+  onSelect = event => {
+    this.setState(prevState => ({
+      isOpen: !prevState.isOpen
+    }));
+  };
+
+  render() {
+    const {
+      children,
+      actions,
+      className,
+      id,
+      'aria-label': ariaLabel,
+      'aria-labelledby': ariaLabelledBy,
+      ...props
+    } = this.props;
+
+    return children ? (
+      children
+    ) : (
+      <div className={css(styles.dataListAction, className)} {...props}>
+        <Dropdown
+          isPlain
+          position={DropdownPosition.right}
+          isOpen={this.state.isOpen}
+          onSelect={this.onSelect}
+          toggle={<KebabToggle onToggle={this.onToggle} />}
+          dropdownItems={actions}
+        />
+      </div>
+    );
+  }
+}
 
 DataListAction.propTypes = {
   /** Content rendered inside the DataList list */
   children: PropTypes.node,
   /** Additional classes added to the DataList list */
   className: PropTypes.string,
+  /** DataList actions to show in the dropdown */
+  actions: PropTypes.arrayOf(PropTypes.node).isRequired,
   /** Identify the DataList toggle number */
   id: PropTypes.string.isRequired,
   /** Adds accessible text to the DataList item */
diff --git a/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap b/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
index 1d667172ea6..23e998c90c0 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
@@ -31,6 +31,84 @@ exports[`DataList Cell default 1`] = `
 </div>
 `;
 
+exports[`DataList DataListAction button 1`] = `
+<Button
+  aria-label={null}
+  className=""
+  component="button"
+  id="delete-item-1"
+  isActive={false}
+  isBlock={false}
+  isDisabled={false}
+  isFocus={false}
+  isHover={false}
+  type="button"
+  variant="primary"
+>
+  Delete
+</Button>
+`;
+
+exports[`DataList DataListAction dropdown 1`] = `
+.pf-c-data-list__action {
+  display: block;
+  flex: 0 0 auto;
+  margin-left: 1.5rem;
+}
+
+<div
+  className="pf-c-data-list__action"
+>
+  <Dropdown
+    className=""
+    direction="down"
+    dropdownItems={
+      Array [
+        <Item
+          className=""
+          component="button"
+          href="#"
+          isDisabled={false}
+          isHovered={false}
+          onClick={[MockFunction]}
+        >
+          action-1
+        </Item>,
+        <Item
+          className=""
+          component="button"
+          href="#"
+          isDisabled={false}
+          isHovered={false}
+          onClick={[MockFunction]}
+        >
+          action-2
+        </Item>,
+      ]
+    }
+    isOpen={false}
+    isPlain={true}
+    onSelect={[Function]}
+    position="right"
+    toggle={
+      <Kebab
+        aria-label="Actions"
+        className=""
+        id=""
+        isActive={false}
+        isDisabled={false}
+        isFocused={false}
+        isHovered={false}
+        isOpen={false}
+        isPlain={false}
+        onToggle={[Function]}
+        parentRef={null}
+      />
+    }
+  />
+</div>
+`;
+
 exports[`DataList Item 1`] = `
 .pf-c-data-list__item.data-list-item-custom {
   display: flex;
diff --git a/packages/patternfly-4/react-core/src/components/DataList/examples/ActionsDataList.js b/packages/patternfly-4/react-core/src/components/DataList/examples/ActionsDataList.js
new file mode 100644
index 00000000000..4d20dbe91c4
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/DataList/examples/ActionsDataList.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import {
+  Button,
+  Dropdown,
+  KebabToggle,
+  DropdownItem,
+  DataList,
+  DataListItem,
+  DataListCell,
+  DataListCheck,
+  DataListAction
+} from '@patternfly/react-core';
+
+class ActionsDataList extends React.Component {
+  state = { isOpen: false, isDeleted: false };
+  render() {
+    return (
+      <React.Fragment>
+        <DataList aria-label="single action data list example ">
+          {!this.state.isDeleted && (
+            <DataListItem aria-labelledby="single-action-item1">
+              <DataListCell>
+                <span id="single-action-item1">Single actionable Primary content</span>
+              </DataListCell>
+              <DataListCell>Single actionable Secondary content</DataListCell>
+              <DataListAction
+                aria-labelledby="single-action-item1 single-action-action1"
+                id="single-action-action1"
+                aria-label="Actions"
+              >
+                <Button
+                  onClick={() => {
+                    if (confirm('Are you sure?')) {
+                      this.setState({ isDeleted: true });
+                    }
+                  }}
+                  variant="primary"
+                  key="delete-action"
+                >
+                  Delete
+                </Button>
+              </DataListAction>
+            </DataListItem>
+          )}
+          <DataListItem aria-labelledby="multi-actions-item1">
+            <DataListCell>
+              <span id="multi-actions-item1">Multi actions Primary content</span>
+            </DataListCell>
+            <DataListCell>Multi actions Secondary content</DataListCell>
+            <DataListAction
+              aria-labelledby="multi-actions-item1 multi-actions-action1"
+              id="multi-actions-action1"
+              aria-label="Actions"
+              actions={[
+                <DropdownItem key="link">Link</DropdownItem>,
+                <DropdownItem key="action" component="button">
+                  Action
+                </DropdownItem>,
+                <DropdownItem key="disabled link" isDisabled>
+                  Disabled Link
+                </DropdownItem>
+              ]}
+            />
+            } />
+          </DataListItem>
+        </DataList>
+      </React.Fragment>
+    );
+  }
+}
+
+export default ActionsDataList;