Skip to content

Commit

Permalink
Fix React imports
Browse files Browse the repository at this point in the history
  • Loading branch information
dk981234 committed Feb 17, 2025
1 parent 3b93d31 commit c497b88
Show file tree
Hide file tree
Showing 48 changed files with 67 additions and 69 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ActionDropdownViewModel, getActionDropdownButtonTarget } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { Popup } from "../popup/popup";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import * as React from "react";
import * as ReactDOM from "react-dom";
import { Base, Action } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down Expand Up @@ -58,7 +58,7 @@ export class SurveyAction extends SurveyElementBase<IActionBarItemProps, any> {
super.componentDidMount();
this.item.updateModeCallback = (mode, callback) => {
queueMicrotask(() => {
if((ReactDOM as any)["flushSync"]) {
if ((ReactDOM as any)["flushSync"]) {
(ReactDOM as any)["flushSync"](() => {
this.item.mode = mode;
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";

export class SurveyActionBarSeparator extends React.Component<any, any> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import {
Base,
Action,
Expand Down Expand Up @@ -36,7 +36,7 @@ export class SurveyActionBar extends SurveyElementBase<IActionBarProps, any> {
super.componentDidMount();
if (!this.model.hasActions) return;
const container: HTMLDivElement | null = this.rootRef.current;
if(!!container) {
if (!!container) {
this.model.initResponsivityManager(container, (callback) => { setTimeout(callback, 100); });
}
}
Expand All @@ -46,12 +46,12 @@ export class SurveyActionBar extends SurveyElementBase<IActionBarProps, any> {
}
componentDidUpdate(prevProps: IActionBarProps, prevState: any): void {
super.componentDidUpdate(prevProps, prevState);
if(prevProps.model != this.props.model) {
if (prevProps.model != this.props.model) {
prevProps.model.resetResponsivityManager();
}
if (!!this.model.hasActions) {
const container: HTMLDivElement | null = this.rootRef.current;
if(!!container) {
if (!!container) {
this.model.initResponsivityManager(container, (callback) => { setTimeout(callback, 100); });
}
}
Expand All @@ -68,7 +68,7 @@ export class SurveyActionBar extends SurveyElementBase<IActionBarProps, any> {
<div
ref={this.rootRef}
className={this.model.getRootCss()}
onClick={this.handleClick ? function(event) {
onClick={this.handleClick ? function (event) {
event.stopPropagation();
} : undefined}
>
Expand Down
4 changes: 2 additions & 2 deletions packages/survey-react-ui/src/components/brand-info.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import * as React from "react";

export class BrandInfo extends React.Component<any, any> {
render() {
return (
<div className="sv-brand-info">
<a className="sv-brand-info__logo" href="https://surveyjs.io/?utm_source=built-in_links&utm_medium=online_survey_tool&utm_campaign=landing_page"><img src="https://surveyjs.io/Content/Images/poweredby.svg"/></a>
<a className="sv-brand-info__logo" href="https://surveyjs.io/?utm_source=built-in_links&utm_medium=online_survey_tool&utm_campaign=landing_page"><img src="https://surveyjs.io/Content/Images/poweredby.svg" /></a>
<div className="sv-brand-info__text">Try and see how easy it is to <a href="https://surveyjs.io/create-survey?utm_source=built-in_links&utm_medium=online_survey_tool&utm_campaign=create_survey">create a survey</a></div>
<div className="sv-brand-info__terms"><a href="https://surveyjs.io/TermsOfUse">Terms of Use & Privacy Statement</a></div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Base, CharacterCounter } from "survey-core";
import { ReactElementFactory } from "../element-factory";
import { SurveyElementBase } from "../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ISurveyLayoutElement } from "survey-core";
import { ReactElementFactory } from "../element-factory";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { attachKey2click } from "../../reactSurvey";
import { ReactSurveyElement } from "../../reactquestion_element";
import { QuestionFileModel } from "survey-core";
Expand All @@ -21,7 +21,7 @@ export class SurveyFileChooseButton extends ReactSurveyElement {
aria-label={this.question.chooseButtonText}
onClick={(e) => this.question.chooseFile(e.nativeEvent)}
>
{(!!this.question.cssClasses.chooseFileIconId) ? <SvgIcon title={this.question.chooseButtonText} iconName={this.question.cssClasses.chooseFileIconId} size={"auto"}></SvgIcon>: null }
{(!!this.question.cssClasses.chooseFileIconId) ? <SvgIcon title={this.question.chooseButtonText} iconName={this.question.cssClasses.chooseFileIconId} size={"auto"}></SvgIcon> : null}
<span>{this.question.chooseButtonText}</span>
</label>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/file/file-item.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyElementBase } from "../../reactquestion_element";
import { QuestionFileModel } from "survey-core";
import { SvgIcon } from "../svg-icon/svg-icon";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/file/file-page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyElementBase } from "../../reactquestion_element";
import { QuestionFileModel, QuestionFilePage } from "survey-core";
import { SurveyFileItem } from "./file-item";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyElementBase } from "../../reactquestion_element";
import { QuestionFileModel } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/header.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Base, SurveyModel, Cover, CoverCell } from "survey-core";
import { SurveyElementBase } from "../reactquestion_element";
import { ReactElementFactory } from "../element-factory";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ListModel } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ListModel } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/list/list-item.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ListModel } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
12 changes: 6 additions & 6 deletions packages/survey-react-ui/src/components/list/list.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { IAction, ListModel, settings } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down Expand Up @@ -33,25 +33,25 @@ export class List extends SurveyElementBase<IListProps, any> {
}
componentDidMount(): void {
super.componentDidMount();
if(!!this.listContainerRef && !!this.listContainerRef.current) {
if (!!this.listContainerRef && !!this.listContainerRef.current) {
this.model.initListContainerHtmlElement(this.listContainerRef.current);
}
}
public componentDidUpdate(prevProps: any, prevState: any): void {
super.componentDidUpdate(prevProps, prevState);
if (this.model !== prevProps.model) {
if(this.model && !!this.listContainerRef?.current) {
if (this.model && !!this.listContainerRef?.current) {
this.model.initListContainerHtmlElement(this.listContainerRef.current);
}
if(prevProps.model) {
if (prevProps.model) {
prevProps.model.initListContainerHtmlElement(undefined as any);
}
}
}

componentWillUnmount(): void {
super.componentWillUnmount();
if(!!this.model) {
if (!!this.model) {
this.model.initListContainerHtmlElement(undefined as any);
}
}
Expand All @@ -65,7 +65,7 @@ export class List extends SurveyElementBase<IListProps, any> {
);
}
renderList() {
if(!this.model.renderElements) return null;
if (!this.model.renderElements) return null;

const items = this.renderItems();
const ulStyle = { display: this.model.isEmpty ? "none" : null };
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Action, MatrixDropdownRowModelBase, QuestionMatrixDropdownModelBase } from "survey-core";
import { ReactElementFactory } from "../../../element-factory";
import { ReactSurveyElement } from "../../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { QuestionMatrixDropdownModelBase } from "survey-core";
import { ReactElementFactory } from "../../../element-factory";
import { ReactSurveyElement } from "../../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import {
MatrixDropdownRowModelBase,
QuestionMatrixDropdownModelBase,
Expand Down
11 changes: 5 additions & 6 deletions packages/survey-react-ui/src/components/matrix/row.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from "react";
import ReactDOM from "react-dom";
import * as React from "react";
import { QuestionMatrixDropdownRenderedRow, QuestionMatrixDropdownModelBase } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down Expand Up @@ -29,7 +28,7 @@ export class MatrixRow extends SurveyElementBase<IMatrixRowProps, any> {

componentDidMount(): void {
super.componentDidMount();
if(this.root.current) {
if (this.root.current) {
this.model.setRootElement(this.root.current);
}
}
Expand All @@ -42,10 +41,10 @@ export class MatrixRow extends SurveyElementBase<IMatrixRowProps, any> {
public shouldComponentUpdate(nextProps: any, nextState: any): boolean {
if (!super.shouldComponentUpdate(nextProps, nextState)) return false;
if (nextProps.model !== this.model) {
if(nextProps.element) {
if (nextProps.element) {
nextProps.element.setRootElement(this.root.current);
}
if(this.model) {
if (this.model) {
this.model.setRootElement(undefined as any);
}
}
Expand All @@ -54,7 +53,7 @@ export class MatrixRow extends SurveyElementBase<IMatrixRowProps, any> {

render() {
const model = this.model;
if(!model.visible) return null;
if (!model.visible) return null;
return (
<tr
ref={this.root}
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/notifier.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Base, Notifier } from "survey-core";
import { SurveyElementBase } from "../reactquestion_element";
import { ReactElementFactory } from "../element-factory";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import {
QuestionPanelDynamicModel
} from "survey-core";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { SvgIcon } from "../svg-icon/svg-icon";
import { SurveyQuestionPanelDynamicAction } from "./paneldynamic-add-btn";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { SvgIcon } from "../svg-icon/svg-icon";
import { SurveyQuestionPanelDynamicAction } from "./paneldynamic-add-btn";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { SurveyQuestionPanelDynamicAction } from "./paneldynamic-add-btn";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { SurveyQuestionPanelDynamicAction } from "./paneldynamic-add-btn";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createPortal } from "react-dom";
import React from "react";
import * as React from "react";
import { PopupContainer } from "./popup";
import { SurveyElementBase } from "../../reactquestion_element";
import { createPopupModalViewModel, IDialogOptions, PopupBaseViewModel, settings } from "survey-core";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/popup/popup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Base, PopupModel, PopupBaseViewModel, PopupDropdownViewModel, createPopupViewModel, CssClassBuilder } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/question-error.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyError } from "survey-core";
import { ReactElementFactory } from "../element-factory";
import { SurveyLocStringViewer } from "../string-viewer";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { QuestionRatingModel, RenderedRatingItem } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { QuestionRatingModel, RenderedRatingItem } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Base, QuestionRatingModel, RenderedRatingItem } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyElementBase } from "../../reactquestion_element";
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/skeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../element-factory";

export class Skeleton extends React.Component<any, any> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { Action } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { ReactSurveyElement } from "../../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyModel } from "survey-core";
import { ReactElementFactory } from "../../element-factory";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyModel } from "survey-core";
import { SurveyElementBase } from "../../reactquestion_element";
import { ReactElementFactory } from "../../element-factory";
Expand Down
8 changes: 4 additions & 4 deletions packages/survey-react-ui/src/components/svg-icon/svg-icon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { ReactElementFactory } from "../../element-factory";
import { createSvg } from "survey-core";

Expand All @@ -10,7 +10,7 @@ export class SvgIcon extends React.Component<any, any> {
}

updateSvg() {
if(this.props.iconName)
if (this.props.iconName)
createSvg(
this.props.size,
this.props.width,
Expand All @@ -25,12 +25,12 @@ export class SvgIcon extends React.Component<any, any> {
}
render() {
let className = "sv-svg-icon";
if(this.props.className) {
if (this.props.className) {
className += " " + this.props.className;
}
return (
this.props.iconName ?
<svg className={ className } style={this.props.style} onClick={this.props.onClick} ref={this.svgIconRef} role="img"><use></use></svg>
<svg className={className} style={this.props.style} onClick={this.props.onClick} ref={this.svgIconRef} role="img"><use></use></svg>
: null
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/components/text-area.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { TextAreaModel } from "survey-core";
import { ReactElementFactory } from "../element-factory";
import { SurveyElementBase } from "../reactquestion_element";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import * as React from "react";
import { SurveyElement, RendererFactory } from "survey-core";
import { ReactElementFactory } from "../../element-factory";
import { SurveyActionBar } from "../action-bar/action-bar";
Expand Down
Loading

0 comments on commit c497b88

Please sign in to comment.