Avoid special treatment for pageProperties

GriddleGriddle · Oct 16, 2017 · d69275a · d69275a
1 parent d2c9570
commit d69275a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/src/index.js b/src/index.js
@@ -72,11 +72,11 @@ class Griddle extends Component {
       settingsComponentObjects,
       selectors,
       styleConfig: defaultStyleConfig,
+
       pageProperties: {
         currentPage: 1,
         pageSize: 10
       },
-
       enableSettings: true,
       textProperties: {
         next: 'Next',

diff --git a/src/module.d.ts b/src/module.d.ts
@@ -380,6 +380,7 @@ interface GriddleExtensibility {
 
 interface GriddleInitialState {
     enableSettings?: boolean;
+    pageProperties?: GriddlePageProperties;
     sortMethod?: (data: any[], column: string, sortAscending?: boolean) => number;
     textProperties?: {
       next?: string,
@@ -399,7 +400,6 @@ export interface GriddleProps<T> extends GriddlePlugin, GriddleInitialState {
     plugins?: GriddlePlugin[];
     data?: T[];
     sortProperties?: GriddleSortKey[];
-    pageProperties?: GriddlePageProperties;
     storeKey?: string;
 }
 

diff --git a/src/utils/__tests__/initilizerTests.js b/src/utils/__tests__/initilizerTests.js
@@ -7,7 +7,6 @@ import { getRowProperties } from '../rowUtils';
 
 const expectedDefaultInitialState = {
   data: [],
-  pageProperties: {},
   renderProperties: {
     rowProperties: null,
     columnProperties: {},

diff --git a/src/utils/initializer.js b/src/utils/initializer.js
@@ -12,7 +12,6 @@ module.exports = function initializer(defaults) {
     settingsComponentObjects,
     selectors,
     styleConfig: defaultStyleConfig,
-    pageProperties: defaultPageProperties,
     ...defaultInitialState
   } = defaults;
 
@@ -23,7 +22,6 @@ module.exports = function initializer(defaults) {
     events: userEvents = {},
     sortProperties = {},
     styleConfig: userStyleConfig = {},
-    pageProperties: userPageProperties,
     components: userComponents,
     renderProperties: userRenderProperties = {},
     settingsComponentObjects: userSettingsComponentObjects,
@@ -60,7 +58,6 @@ module.exports = function initializer(defaults) {
     ...plugins.map(p => p.styleConfig),
     userStyleConfig);
 
-  const pageProperties = Object.assign({}, defaultPageProperties, userPageProperties);
 
   // TODO: This should also look at the default and plugin initial state objects
   const renderProperties = Object.assign({
@@ -75,7 +72,6 @@ module.exports = function initializer(defaults) {
     userInitialState,
     {
       data,
-      pageProperties,
       renderProperties,
       sortProperties,
       styleConfig,