Skip to content

Commit

Permalink
fix(menu): use default export
Browse files Browse the repository at this point in the history
  • Loading branch information
jigsawye committed Jan 29, 2019
1 parent 04729db commit a310499
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 28 deletions.
7 changes: 1 addition & 6 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ module.exports = {
transformIgnorePatterns: ['/node_modules/'],
testPathIgnorePatterns: ['/node_modules/', 'lib', '/test/'],
transform: {
'^.+\\.(ts|tsx)?$': 'babel-jest',
},
globals: {
'ts-jest': {
tsConfigFile: 'tsconfig.json',
},
'^.+\\.(ts|tsx|js|jsx)?$': 'babel-jest',
},
testMatch: ['**/__tests__/*.+(ts|tsx|js)'],
moduleFileExtensions: ['ts', 'tsx', 'js'],
Expand Down
File renamed without changes.
32 changes: 23 additions & 9 deletions src/lab/Menu/Menu.tsx → src/NewMenu/Menu.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
import React, { FunctionComponent, useRef, useState } from 'react';
import { config, useChain, useSpring } from 'react-spring/hooks';
import { config, useChain, useSpring } from 'react-spring/hooks.cjs';

import Backdrop from '../../Backdrop';
import Flex from '../../Grid/Flex';
import Backdrop from '../Backdrop';
import Flex from '../Grid/Flex';

import MenuContext from './MenuContext';
import MenuDivider from './MenuDivider';
import MenuItem from './MenuItem';
import SubMenu from './SubMenu';
import { AnimatedSubMenuWrapper } from './styles';

const spring = { ...config.stiff, precision: 0.1 };

const Menu: FunctionComponent<any> = ({
children,
defaultActiveSubId = null,
defaultActiveItemId = null,
}) => {
export interface IMenuProps {
defaultActiveSubId?: string;
defaultActiveItemId?: string;
}

const Menu: FunctionComponent<IMenuProps> & {
SubMenu: typeof SubMenu;
Divider: typeof MenuDivider;
Item: typeof MenuItem;
} = ({ children, defaultActiveSubId = null, defaultActiveItemId = null }) => {
const [subMenuVisible, setSubMenuVisible] = useState(false);
const [activeSubId, setActiveSubId] = useState(defaultActiveSubId);
const [activeSubId, setActiveSubId] = useState<string | null>(
defaultActiveSubId
);
const [activeItemId, setActiveItemId] = useState(defaultActiveItemId);

const subMenuSpringRef = useRef(null);
Expand Down Expand Up @@ -82,4 +92,8 @@ const Menu: FunctionComponent<any> = ({
);
};

Menu.Divider = MenuDivider;
Menu.SubMenu = SubMenu;
Menu.Item = MenuItem;

export default Menu;
4 changes: 2 additions & 2 deletions src/lab/Menu/MenuContext.ts → src/NewMenu/MenuContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { createContext } from 'react';

const MenuContext = createContext<{
subMenuVisible: boolean;
activeSubId: string;
activeSubId: string | null;
setActiveSubId: (subId: string | null) => void;
activeItemId: string;
activeItemId: string | null;
setActiveItemId: (itemId: string) => void;
subMenuContentSpringProps: any;
}>({
Expand Down
4 changes: 2 additions & 2 deletions src/lab/Menu/MenuDivider.tsx → src/NewMenu/MenuDivider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import Box from '../../Grid/Box';
import Flex from '../../Grid/Flex';
import Box from '../Grid/Box';
import Flex from '../Grid/Flex';

const MenuDivider = () => (
<Flex
Expand Down
4 changes: 2 additions & 2 deletions src/lab/Menu/MenuItem.tsx → src/NewMenu/MenuItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FunctionComponent, useContext } from 'react';

import Box from '../../Grid/Box';
import Icon from '../../Icon';
import Box from '../Grid/Box';
import Icon from '../Icon';

import MenuContenx from './MenuContext';
import { StyledMenuItem } from './styles';
Expand Down
6 changes: 3 additions & 3 deletions src/lab/Menu/SubMenu.tsx → src/NewMenu/SubMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import React, {
useState,
} from 'react';

import Flex from '../../Grid/Flex';
import Icon, { IconType } from '../../Icon';
import Tooltip from '../../Tooltip';
import Flex from '../Grid/Flex';
import Icon, { IconType } from '../Icon';
import Tooltip from '../Tooltip';

import MenuContext from './MenuContext';
import SubMenuContent from './SubMenuContent';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React, {
useState,
} from 'react';

import Box from '../../Grid/Box';
import Box from '../Grid/Box';

import { AnimatedSubMenuContentWrapper } from './styles';

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/lab/Menu/styles.ts → src/NewMenu/styles.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import styled, { css } from 'styled-components';
import { animated } from 'react-spring/hooks';
import { animated } from 'react-spring/hooks.cjs';

import tag from 'utils/CleanTag';

import Box from '../../Grid/Box';
import Box from '../Grid/Box';

const SubMenuWrapper = styled(tag.div)`
position: absolute;
Expand Down
2 changes: 2 additions & 0 deletions src/__tests__/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
Mention,
Menu,
Modal,
NewMenu,
Popconfirm,
Popover,
Radio,
Expand Down Expand Up @@ -61,6 +62,7 @@ describe('index', () => {
expect(Menu).toBeDefined();
expect(Mention).toBeDefined();
expect(message).toBeDefined();
expect(NewMenu).toBeDefined();
expect(Modal).toBeDefined();
expect(Popconfirm).toBeDefined();
expect(Popover).toBeDefined();
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export { default as Label } from './Form/Label';
export { default as Menu } from './Menu';
export { default as Mention } from './Mention';
export { default as message } from './message';
export { default as NewMenu } from './NewMenu';
export { default as Modal } from './Modal';
export { default as Popconfirm } from './Popconfirm';
export { default as Popover } from './Popover';
Expand Down
1 change: 0 additions & 1 deletion src/lab/index.ts

This file was deleted.

1 change: 1 addition & 0 deletions typings/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ import 'jest-dom/extend-expect';

import './custom-typings';
import './styled';
import './react-spring';
3 changes: 3 additions & 0 deletions typings/react-spring.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
declare module 'react-spring/hooks.cjs' {
export * from 'react-spring/hooks'
}

0 comments on commit a310499

Please sign in to comment.