diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx index 59fb0bd1cd..abb254f15e 100644 --- a/app/client/src/sagas/PageSagas.tsx +++ b/app/client/src/sagas/PageSagas.tsx @@ -123,12 +123,12 @@ export function* fetchPageSaga( if (isValidResponse) { // Get Canvas payload const canvasWidgetsPayload = getCanvasWidgetsPayload(fetchPageResponse); - // Execute page load actions - yield put(executePageLoadActions(canvasWidgetsPayload.pageActions)); // Update the canvas yield put(updateCanvas(canvasWidgetsPayload)); // dispatch fetch page success yield put(fetchPageSuccess()); + // Execute page load actions + yield put(executePageLoadActions(canvasWidgetsPayload.pageActions)); } } catch (error) { yield put({ @@ -155,8 +155,6 @@ export function* fetchPublishedPageSaga( const isValidResponse = yield validateResponse(response); if (isValidResponse) { const canvasWidgetsPayload = getCanvasWidgetsPayload(response); - // Execute page load actions - yield put(executePageLoadActions(canvasWidgetsPayload.pageActions)); yield put(updateCanvas(canvasWidgetsPayload)); yield put({ type: ReduxActionTypes.FETCH_PUBLISHED_PAGE_SUCCESS, @@ -167,6 +165,8 @@ export function* fetchPublishedPageSaga( pageWidgetId: canvasWidgetsPayload.pageWidgetId, }, }); + // Execute page load actions + yield put(executePageLoadActions(canvasWidgetsPayload.pageActions)); } } catch (error) { yield put({ diff --git a/app/client/src/widgets/InputWidget.tsx b/app/client/src/widgets/InputWidget.tsx index 3ba85d9273..9779fd86ce 100644 --- a/app/client/src/widgets/InputWidget.tsx +++ b/app/client/src/widgets/InputWidget.tsx @@ -65,9 +65,8 @@ class InputWidget extends BaseWidget { componentDidMount() { super.componentDidMount(); - if (this.props.defaultText) { - this.updateWidgetMetaProperty("text", this.props.defaultText); - } + const text = this.props.defaultText || ""; + this.updateWidgetMetaProperty("text", text); } componentDidUpdate(prevProps: InputWidgetProps) {