add fixes after code review

Signed-off-by: Evgeny Zhgulev <evgeny.zhgulev@actionengine.com>
keplergl · May 4, 2022 · 50265d0 · 50265d0
1 parent 69972e9
commit 50265d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/components/editor/editor.tsx b/src/components/editor/editor.tsx
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import React, {Component, ComponentType, CSSProperties, KeyboardEvent} from 'react';
+import React, {Component, CSSProperties, KeyboardEvent} from 'react';
 import styled from 'styled-components';
 import {Editor as Draw} from 'react-map-gl-draw';
 import window from 'global/window';
@@ -43,7 +43,6 @@ const StyledWrapper = styled.div`
   position: relative;
 `;
 
-// @ts-ignore
 const editorLayerFilter = (layer: Layer) => EDITOR_AVAILABLE_LAYERS.includes(layer.type);
 
 EditorFactory.deps = [FeatureActionPanelFactory];
@@ -55,8 +54,7 @@ interface EditorProps {
   editor: {selectedFeature: Feature; mode: string};
   layersToRender: Record<string, Layer>;
   index: number;
-  className: string; // ??
-  classnames: string;
+  className: string;
   clickRadius: number;
   style: CSSProperties;
   isEnabled: boolean;
@@ -67,8 +65,8 @@ interface EditorProps {
 }
 
 export default function EditorFactory(
-  FeatureActionPanel: ComponentType<FeatureActionPanelProps>
-): ComponentType<EditorProps> {
+  FeatureActionPanel: React.FC<FeatureActionPanelProps>
+): React.ComponentClass<EditorProps> {
   class Editor extends Component<EditorProps> {
     static defaultProps = {
       clickRadius: DEFAULT_RADIUS

diff --git a/src/components/editor/feature-action-panel.tsx b/src/components/editor/feature-action-panel.tsx
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import React, {useCallback, useState, ComponentType} from 'react';
+import React, {useCallback, useState} from 'react';
 import {useIntl} from 'react-intl';
 
 import ActionPanel, {ActionPanelItem} from 'components/common/action-panel';
@@ -42,7 +42,7 @@ PureFeatureActionPanelFactory.deps = [];
 export interface FeatureActionPanelProps {
   className?: string;
   datasets: Datasets;
-  selectedFeature: Feature;
+  selectedFeature: Feature | null;
   position: {
     x: number;
     y: number;
@@ -54,7 +54,7 @@ export interface FeatureActionPanelProps {
   onClose: () => void;
 }
 
-export function PureFeatureActionPanelFactory(): ComponentType<FeatureActionPanelProps> {
+export function PureFeatureActionPanelFactory(): React.FC<FeatureActionPanelProps> {
   const FeatureActionPanel = ({
     className,
     datasets,
@@ -132,7 +132,7 @@ FeatureActionPanelFactory.deps = PureFeatureActionPanelFactory.deps;
 export default function FeatureActionPanelFactory() {
   const PureFeatureActionPanel = PureFeatureActionPanelFactory();
 
-  const ClickOutsideFeatureActionPanel = (props: FeatureActionPanelProps) => {
+  const ClickOutsideFeatureActionPanel: React.FC<FeatureActionPanelProps> = props => {
     // @ts-ignore
     ClickOutsideFeatureActionPanel.handleClickOutside = (e: Event) => {
       e.preventDefault();

diff --git a/src/constants/default-settings.ts b/src/constants/default-settings.ts
@@ -904,7 +904,7 @@ export const EDITOR_MODES = {
   EDIT: EditorModes.EDIT_VERTEX
 };
 
-export const EDITOR_AVAILABLE_LAYERS = [
+export const EDITOR_AVAILABLE_LAYERS: string[] = [
   LAYER_TYPES.point,
   LAYER_TYPES.hexagon,
   LAYER_TYPES.arc,