Cleaned up proptypes to be a little more DRY

addon/components/frost-table-body.js

@@ -20,12 +20,13 @@ export default Component.extend({
   // == PropTypes =============================================================
 
   propTypes: {
-    // required
-    onCallback: PropTypes.func.isRequired,
 
     // options
     columns: PropTypes.arrayOf(ColumnPropType),
-    items: ItemsPropType
+    items: ItemsPropType,
+
+    // callbacks
+    onCallback: PropTypes.func.isRequired
 
     // state
   },

addon/components/frost-table-cell-renderer.js

@@ -6,6 +6,8 @@
 import {Component} from 'ember-frost-core'
 import {PropTypes} from 'ember-prop-types'
 
+import {ItemPropType} from 'ember-frost-table/typedefs'
+
 export default Component.extend({
   // == Dependencies ==========================================================
 
@@ -14,11 +16,14 @@ export default Component.extend({
   // == PropTypes =============================================================
 
   propTypes: {
-    // required
-    item: PropTypes.object,
+    // options
+    item: ItemPropType,
     value: PropTypes.any,
 
+    // callbacks
     onCallback: PropTypes.func.isRequired
+
+    // state
   },
 
   // == Computed Properties ===================================================

addon/components/frost-table-cell.js

@@ -6,6 +6,7 @@ import {Component} from 'ember-frost-core'
 import {PropTypes} from 'ember-prop-types'
 
 import layout from '../templates/components/frost-table-cell'
+import {ItemPropType} from 'ember-frost-table/typedefs'
 
 export default Component.extend({
   // == Dependencies ==========================================================
@@ -18,11 +19,15 @@ export default Component.extend({
   // == PropTypes =============================================================
 
   propTypes: {
+    // options
     cellRenderer: PropTypes.any,
-    item: PropTypes.oneOfType([PropTypes.EmberObject, PropTypes.object]),
+    item: ItemPropType,
     value: PropTypes.any,
 
+    // callbacks
     onCallback: PropTypes.func.isRequired
+
+    // state
   },
 
   // == Computed Properties ===================================================

addon/components/frost-table-header.js

@@ -20,9 +20,11 @@ export default Component.extend({
 
   propTypes: {
     // options
-    onCallback: PropTypes.func.isRequired,
     cellTagName: PropTypes.string,
-    columns: PropTypes.arrayOf(ColumnPropType)
+    columns: PropTypes.arrayOf(ColumnPropType),
+
+    // callbacks
+    onCallback: PropTypes.func.isRequired
 
     // state
   },

addon/components/frost-table-row-selection.js

@@ -9,6 +9,7 @@ import {Component} from 'ember-frost-core'
 import {PropTypes} from 'ember-prop-types'
 
 import layout from '../templates/components/frost-table-row-selection'
+import {ItemPropType} from 'ember-frost-table/typedefs'
 
 export default Component.extend({
 
@@ -21,12 +22,14 @@ export default Component.extend({
   // == PropTypes =============================================================
 
   propTypes: {
-    // required
-    item: PropTypes.object.isRequired,
+    // options
+    item: ItemPropType.isRequired,
     itemKey: PropTypes.string.isRequired,
+
+    // callbacks
     onSelect: PropTypes.func.isRequired
 
-    // options
+    // state
   },
 
   getDefaultProps () {

addon/components/frost-table-row.js

@@ -9,7 +9,7 @@ import {Component} from 'ember-frost-core'
 import {PropTypes} from 'ember-prop-types'
 
 import layout from '../templates/components/frost-table-row'
-import {ColumnPropType} from 'ember-frost-table/typedefs'
+import {ColumnPropType, ItemPropType} from 'ember-frost-table/typedefs'
 
 export default Component.extend({
   // == Dependencies ==========================================================
@@ -24,11 +24,13 @@ export default Component.extend({
 
   propTypes: {
     // options
-    onCallback: PropTypes.func.isRequired,
     cellCss: PropTypes.string,
     cellTagName: PropTypes.string,
     columns: PropTypes.arrayOf(ColumnPropType),
-    item: PropTypes.oneOfType([PropTypes.EmberObject, PropTypes.object])
+    item: ItemPropType,
+
+    // callbacks
+    onCallback: PropTypes.func.isRequired
 
     // state
   },

addon/components/frost-table.js

@@ -9,7 +9,7 @@ import {PropTypes} from 'ember-prop-types'
 
 import layout from '../templates/components/frost-table'
 import selection from '../utils/selection'
-import {ColumnPropType, ItemsPropType} from 'ember-frost-table/typedefs'
+import {ColumnPropType, ItemPropType, ItemsPropType} from 'ember-frost-table/typedefs'
 
 export default Component.extend({
   // == Dependencies ==========================================================
@@ -23,17 +23,13 @@ export default Component.extend({
   // == PropTypes =============================================================
 
   propTypes: {
-    // required
-    columns: PropTypes.arrayOf(ColumnPropType).isRequired,
-    items: ItemsPropType.isRequired,
-
     // options
+    columns: PropTypes.arrayOf(ColumnPropType).isRequired,
     itemKey: PropTypes.string,
-    selectedItems: PropTypes.arrayOf(PropTypes.oneOfType([
-      PropTypes.EmberObject,
-      PropTypes.object
-    ])),
+    items: ItemsPropType.isRequired,
+    selectedItems: PropTypes.arrayOf(ItemPropType),
 
+    // callbacks
     onCallback: PropTypes.func,
     onSelectionChange: PropTypes.func,
 

addon/typedefs.js

@@ -25,12 +25,12 @@ export const ColumnPropType = PropTypes.shape({
   renderer: PropTypes.any
 })
 
+export const ItemPropType = PropTypes.oneOfType([
+  PropTypes.object,
+  PropTypes.EmberObject
+])
+
 export const ItemsPropType = PropTypes.oneOfType([
   PropTypes.EmberObject, // DS.RecordArray
-  PropTypes.arrayOf(
-    PropTypes.oneOfType([
-      PropTypes.object,
-      PropTypes.EmberObject
-    ])
-  )
+  PropTypes.arrayOf(ItemPropType)
 ])

tests/dummy/app/pods/demo/frost-fixed-table/template.hbs

@@ -19,11 +19,12 @@
         name='John Doe'
       )
     )
+
     onCallback= // a handler that handles an object with {action, row, col, args}
   }}
 {{ END-SNIPPET --}}
 {{!-- BEGIN-SNIPPET dispatcher-example }}
-    dispatchNotifications ({action, row, col, args}) {
+    dispatchNotification ({action, row, col, args}) {
       // row will be -1 for events that come from the header row,
       // and zero indexed for data rows.
       Logger.log(action, row, col, args)
@@ -89,4 +90,4 @@
     }}
     {{! END-SNIPPET }}
   </div>
-</div>
+</div>

tests/dummy/app/pods/demo/frost-table-body/template.hbs

@@ -17,6 +17,8 @@
         name='John Doe'
       )
     )
+
+    onCallback= // a handler that handles an object with {action, row, col, args}
   }}
 {{ END-SNIPPET --}}
 
@@ -56,8 +58,10 @@
         )
         hook='myTableBody'
         items=heroes
+
+        onCallback=(action 'dispatchNotification')
       }}
     </table>
     {{! END-SNIPPET }}
   </div>
-</div>
+</div>

tests/dummy/app/pods/demo/frost-table-header/template.hbs

@@ -47,8 +47,10 @@
           )
         )
         hook='myTableHeader'
+
+        onCallback=(action 'dispatchNotification')
       }}
     </table>
     {{! END-SNIPPET }}
   </div>
-</div>
+</div>

tests/dummy/app/pods/demo/frost-table-row/template.hbs

@@ -13,6 +13,8 @@
     item=(hash
       name='Jane Doe'
     )
+
+    onCallback= // a handler that handles an object with {action, row, col, args}
   }}
 {{ END-SNIPPET --}}
 
@@ -54,9 +56,11 @@
           )
           hook='myTableRow'
           item=heroes.[3]
+
+          onCallback=(action 'dispatchNotification')
         }}
       </tbody>
     </table>
     {{! END-SNIPPET }}
   </div>
-</div>
+</div>

tests/dummy/app/pods/demo/frost-table/controller.js

@@ -1,20 +1,3 @@
-import Ember from 'ember'
-const {Logger, inject} = Ember
 import HeroesController from '../heroes-controller'
 
-export default HeroesController.extend({
-  notifier: inject.service(),
-
-  actions: {
-    dispatchNotifications ({action, row, col, args}) {
-      Logger.log('Dispatching: ', action, row, col, args)
-      // This is where you would do your custom dispatching.
-      const message = `(${action} ${row} ${col} ${args})`
-      this.get('notifier').addNotification({
-        message: message,
-        type: 'success',
-        autoClear: true
-      })
-    }
-  }
-})
+export default HeroesController.extend({})

tests/dummy/app/pods/demo/frost-table/template.hbs

@@ -46,7 +46,6 @@
   <div class='frost-demo-launch'>
     {{! BEGIN-SNIPPET table }}
     {{frost-table
-      onCallback=(action 'dispatchNotifications')
       columns=(array
         (hash
           headerRenderer=(component 'text-input-renderer')
@@ -65,6 +64,8 @@
       )
       hook='myTable'
       items=model.characters
+
+      onCallback=(action 'dispatchNotification')
     }}
     {{! END-SNIPPET }}
   </div>

tests/dummy/app/pods/demo/heroes-controller.js

@@ -2,9 +2,25 @@
  * Controller for providing heroes data
  */
 import Ember from 'ember'
-const {Controller} = Ember
-import heroes from './heroes'
+const {Controller, Logger, inject} = Ember
+
+import heroes from 'dummy/heroes'
 
 export default Controller.extend({
-  heroes
+  heroes,
+
+  notifier: inject.service(),
+
+  actions: {
+    dispatchNotification ({action, row, col, args}) {
+      Logger.log('Dispatching: ', action, row, col, args)
+      // This is where you would do your custom dispatching.
+      const message = `(${action} ${row} ${col} ${args})`
+      this.get('notifier').addNotification({
+        message: message,
+        type: 'success',
+        autoClear: true
+      })
+    }
+  }
 })