From bff450688b0f10e80ce1844434450cd7fbb3fffe Mon Sep 17 00:00:00 2001 From: soupette Date: Wed, 9 Dec 2020 16:39:37 +0100 Subject: [PATCH] Use picker from buffet in ML Signed-off-by: soupette --- .../src/components/FiltersPicker/index.js | 3 +- .../admin/src/components/Picker/Wrapper.js | 7 ---- .../admin/src/components/Picker/index.js | 40 ------------------- .../admin/src/components/SortPicker/index.js | 2 +- 4 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 packages/strapi-plugin-upload/admin/src/components/Picker/Wrapper.js delete mode 100644 packages/strapi-plugin-upload/admin/src/components/Picker/index.js diff --git a/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/index.js b/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/index.js index 8c75453406..f75699246a 100644 --- a/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/FiltersPicker/index.js @@ -2,10 +2,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { FilterIcon } from 'strapi-helper-plugin'; - +import { Picker } from '@buffetjs/core'; import FiltersCard from './FiltersCard'; import Wrapper from './Wrapper'; -import Picker from '../Picker'; import formatFilter from './utils/formatFilter'; diff --git a/packages/strapi-plugin-upload/admin/src/components/Picker/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/Picker/Wrapper.js deleted file mode 100644 index eef401c32f..0000000000 --- a/packages/strapi-plugin-upload/admin/src/components/Picker/Wrapper.js +++ /dev/null @@ -1,7 +0,0 @@ -import styled from 'styled-components'; - -const Wrapper = styled.div` - position: relative; -`; - -export default Wrapper; diff --git a/packages/strapi-plugin-upload/admin/src/components/Picker/index.js b/packages/strapi-plugin-upload/admin/src/components/Picker/index.js deleted file mode 100644 index 013de88546..0000000000 --- a/packages/strapi-plugin-upload/admin/src/components/Picker/index.js +++ /dev/null @@ -1,40 +0,0 @@ -import React, { useState, useRef } from 'react'; -import PropTypes from 'prop-types'; - -import { useClickAwayListener } from '@buffetjs/hooks'; - -import DropdownButton from '../DropdownButton'; -import DropdownSection from '../DropdownSection'; -import Wrapper from './Wrapper'; - -const Picker = ({ renderButtonContent, renderSectionContent }) => { - const [isOpen, setIsOpen] = useState(false); - const dropdownRef = useRef(); - - useClickAwayListener(dropdownRef, () => setIsOpen(false)); - - const handleToggle = () => { - setIsOpen(v => !v); - }; - - return ( - - - {renderButtonContent(isOpen)} - - {renderSectionContent(handleToggle)} - - ); -}; - -Picker.defaultProps = { - renderButtonContent: () => {}, - renderSectionContent: () => {}, -}; - -Picker.propTypes = { - renderButtonContent: PropTypes.func, - renderSectionContent: PropTypes.func, -}; - -export default Picker; diff --git a/packages/strapi-plugin-upload/admin/src/components/SortPicker/index.js b/packages/strapi-plugin-upload/admin/src/components/SortPicker/index.js index 81fd1eafee..1e4402e502 100644 --- a/packages/strapi-plugin-upload/admin/src/components/SortPicker/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/SortPicker/index.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import { useGlobalContext } from 'strapi-helper-plugin'; import { Carret } from '@buffetjs/icons'; +import { Picker } from '@buffetjs/core'; import { getTrad, getFileModelTimestamps } from '../../utils'; import SortList from '../SortList'; -import Picker from '../Picker'; const SortPicker = ({ onChange, value }) => { const { plugins } = useGlobalContext();