refactor(ui): drawer support component naming refactor

akveo · Sep 24, 2019 · 113822c · 113822c
1 parent 6bf8f4f
commit 113822c
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 58 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/framework/ui/drawer/drawer.spec.tsx b/src/framework/ui/drawer/drawer.spec.tsx
@@ -17,7 +17,7 @@ import {
   Drawer,
   DrawerProps,
 } from '../drawer/drawer.component';
-import { DrawerFence } from './drawerFence.component';
+import { DrawerHeaderFooter } from './drawerHeaderFooter.component';
 import {
   MenuItemType,
   MenuItem,
@@ -103,7 +103,7 @@ describe('@drawer: component checks', () => {
 
   it('* should render header', () => {
     const header = () => (
-      <DrawerFence testID='@drawer-header'/>
+      <DrawerHeaderFooter testID='@drawer-header'/>
     );
 
     const component: RenderAPI = renderComponent({ data, header, onSelect: () => 1 });
@@ -113,7 +113,7 @@ describe('@drawer: component checks', () => {
 
   it('* should render footer', () => {
     const footer = () => (
-      <DrawerFence testID='@drawer-footer'/>
+      <DrawerHeaderFooter testID='@drawer-footer'/>
     );
 
     const component: RenderAPI = renderComponent({ data, footer, onSelect: () => 1 });

diff --git a/src/framework/ui/drawer/drawerFence.component.tsx b/src/framework/ui/drawer/drawerFence.component.tsx
diff --git a/src/framework/ui/drawer/drawerHeaderFooter.component.tsx b/src/framework/ui/drawer/drawerHeaderFooter.component.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import {
+  ListItem,
+  ListItemProps,
+  ListItemElement,
+} from '../list/listItem.component';
+
+export type DrawerHeaderFooterProps = Partial<ListItemProps>;
+export type DrawerHeaderFooterElement = ListItemElement;
+
+export class DrawerHeaderFooter extends React.Component<DrawerHeaderFooterProps> {
+
+  public render(): DrawerHeaderFooterElement {
+    return (
+      <ListItem {...this.props}/>
+    );
+  }
+}
diff --git a/src/framework/ui/index.ts b/src/framework/ui/index.ts
@@ -35,10 +35,10 @@ export {
   DrawerHeaderElement,
 } from './drawer/drawer.component';
 export {
-  DrawerFence,
-  DrawerFenceElement,
-  DrawerFenceProps,
-} from './drawer/drawerFence.component';
+  DrawerHeaderFooter,
+  DrawerHeaderFooterElement,
+  DrawerHeaderFooterProps,
+} from './drawer/drawerHeaderFooter.component';
 export {
   Select,
   SelectProps,

diff --git a/src/playground/package-lock.json b/src/playground/package-lock.json
diff --git a/src/playground/src/navigation/drawerNavigation.component.tsx b/src/playground/src/navigation/drawerNavigation.component.tsx
@@ -15,7 +15,7 @@ import {
   DrawerProps,
   MenuItemType,
   Text,
-  DrawerFence,
+  DrawerHeaderFooter,
   Icon,
   Divider,
 } from '@kitten/ui';
@@ -57,7 +57,8 @@ export class DrawerNavigation extends React.Component<DrawerItemsProps> {
   private renderHeader = (): DrawerHeaderElement => {
     return (
       <React.Fragment>
-        <DrawerFence
+        <DrawerHeaderFooter
+          disabled={true}
           title='UI Kitten'
           description='Playground Module'
           icon={this.renderIcon}
@@ -71,7 +72,10 @@ export class DrawerNavigation extends React.Component<DrawerItemsProps> {
     return (
       <React.Fragment>
         <Divider/>
-        <DrawerFence description='Version 4.2.0'/>
+        <DrawerHeaderFooter
+          disabled={true}
+          description='Version 4.2.0'
+        />
       </React.Fragment>
     );
   };