From 9ebcc370b75c0a8e7c81437542ffac484f8b3162 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetu@appsmith.com>
Date: Thu, 14 Nov 2019 12:16:11 +0000
Subject: [PATCH] Fix table widget render issue

---
 app/client/src/sagas/InitSagas.ts      | 2 +-
 app/client/src/sagas/PageSagas.tsx     | 5 ++++-
 app/client/src/widgets/TableWidget.tsx | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts
index 01967a565e..2530dc6f44 100644
--- a/app/client/src/sagas/InitSagas.ts
+++ b/app/client/src/sagas/InitSagas.ts
@@ -51,7 +51,7 @@ export function* initializeAppViewerSaga(
     type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_INIT,
     payload: action.payload,
   });
-  yield take(ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS);
+  yield take(ReduxActionTypes.UPDATE_CANVAS);
   yield put({
     type: ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS,
   });
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index d4a76e6b85..8b464dbb51 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -259,7 +259,10 @@ export default function* pageSagas() {
       ReduxActionTypes.UPDATE_WIDGET_PROPERTY,
       updateWidgetPropertySaga,
     ),
-    takeLatest(ReduxActionTypes.UPDATE_WIDGET_DYNAMIC_PROPERTY, saveLayoutSaga),
+    takeLatest(
+      ReduxActionTypes.UPDATE_WIDGET_DYNAMIC_PROPERTY,
+      updateWidgetPropertySaga,
+    ),
     takeLatest(ReduxActionTypes.CREATE_PAGE_INIT, createPageSaga),
     takeLatest(ReduxActionTypes.FETCH_PAGE_LIST_INIT, fetchPageListSaga),
   ]);
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index c016d88cac..c462c03228 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -70,6 +70,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     );
   }
   componentDidUpdate(prevProps: TableWidgetProps) {
+    super.componentDidUpdate(prevProps);
     const { tableData, selectedRow } = this.props;
     const newData = getTableArrayData(tableData);
     if (