feat(Touchable): rename condition piper

barajs · Apr 25, 2019 · 7844f5a · 7844f5a
1 parent 279c814
commit 7844f5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/lib/exports/Touchable/condition.ts b/src/lib/exports/Touchable/condition.ts
@@ -1,8 +1,5 @@
-import { BaraReactTouchable, TouchableEventFilter } from './event'
+import { kindOf, nameOf } from '../../functions/common'
 
-export const nameOfTouchable = (name: string) => (triggeringEvent: BaraReactTouchable): boolean =>
-  name ? name === triggeringEvent.name : true
+export const nameOfTouchable = nameOf
 
-export const classOfTouchable = (className: string) => (
-  triggeringEvent: BaraReactTouchable,
-): boolean => (className ? className === triggeringEvent.className : true)
+export const kindOfTouchable = kindOf
diff --git a/src/lib/exports/Touchable/event.ts b/src/lib/exports/Touchable/event.ts
@@ -1,11 +1,10 @@
 import { createEventType, useEvent } from 'bara'
 
-export interface BaraReactTouchable {
+import { BaraBaseComponentProps } from '../../models'
+
+export interface BaraReactTouchable extends BaraBaseComponentProps {
   name?: string
-  className?: string
   ref?: any
-  id?: string
-  event?: any
 }
 
 export const ON_TOUCHABLE_PRESS = createEventType('ON_TOUCHABLE_PRESSED')