Skip to content

feat: remove isFocus from meta state in InputWidgetV2 #36843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rahulbarwal merged 6 commits into from
Oct 16, 2024
+38 −28
Merged

feat: remove isFocus from meta state in InputWidgetV2 #36843

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d417db0
remove isFocus prop from evaluations in InputWidgetV2
jacquesikot Oct 11, 2024
a59384b
update state variable
jacquesikot Oct 14, 2024
178c964
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
jacquesikot Oct 14, 2024
4a3163e
remove isFocused from base class
jacquesikot Oct 14, 2024
39235ea
feat: remove isDirty from InputWidgetV2 meta state
jacquesikot Oct 15, 2024
80e9089
feat: add isDirty to meta state for InputWidget
jacquesikot Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions app/client/src/widgets/InputWidgetV2/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type { DerivedPropertiesMap } from "WidgetProvider/factory";
import { ICON_NAMES } from "WidgetProvider/constants";
import { AutocompleteDataType } from "utils/autocomplete/AutocompleteDataType";
import BaseInputWidget from "widgets/BaseInputWidget";
import { isNil, isNumber, merge, toString } from "lodash";
import { isNil, isNumber, merge, toString, omit } from "lodash";
Comment thread
jacquesikot marked this conversation as resolved.
Outdated
import derivedProperties from "./parsedDerivedProperties";
import type { BaseInputWidgetProps } from "widgets/BaseInputWidget/widget";
import { mergeWidgetConfig } from "utils/helpers";
Expand Down Expand Up @@ -300,6 +300,13 @@ function InputTypeUpdateHook(
}

class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
constructor(props: InputWidgetProps) {
super(props);
this.state = {
isFocused: false,
Comment thread
jacquesikot marked this conversation as resolved.
};
}

static type = "INPUT_WIDGET_V2";

static getConfig() {
Expand Down Expand Up @@ -641,7 +648,10 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
static getMetaPropertiesMap(): Record<string, any> {
return merge(super.getMetaPropertiesMap(), {
const baseMetaProperties = super.getMetaPropertiesMap();
const rest = omit(baseMetaProperties, ["isFocused"]);
Comment thread
jacquesikot marked this conversation as resolved.
Outdated
Comment thread
jacquesikot marked this conversation as resolved.
Outdated

return merge(rest, {
Comment thread
jacquesikot marked this conversation as resolved.
Outdated
inputText: "",
text: "",
});
Expand All @@ -663,8 +673,10 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
}

handleFocusChange = (focusState: boolean) => {
this.setState({ isFocused: focusState });

if (focusState) {
this.props.updateWidgetMetaProperty("isFocused", focusState, {
this.executeAction({
triggerPropertyName: "onFocus",
dynamicString: this.props.onFocus,
event: {
Expand All @@ -674,7 +686,7 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> {
}

if (!focusState) {
this.props.updateWidgetMetaProperty("isFocused", focusState, {
this.executeAction({
triggerPropertyName: "onBlur",
dynamicString: this.props.onBlur,
event: {
Expand Down