typescriptify Popupbase

focus textfield on filterclick

src/pages/CategoryPage/CategoryPage.tsx

@@ -4,7 +4,7 @@ import Tag from '../../elements/Tag/Tag';
 import NewTagPopup from '../../elements/Popups/NewTagPopup/NewTagPopup';
 import PageTitle, {Line} from '../../elements/PageTitle/PageTitle';
 import {Route, Switch} from 'react-router-dom';
-import {DefaultTags} from '../../api/GeneralTypes';
+import {DefaultTags} from '../../types/GeneralTypes';
 import {CategoryViewWR} from './CategoryView';
 import TagView from './TagView';
 
@@ -60,11 +60,10 @@ class CategoryPage extends React.Component<{}, CategoryPageState> {
                 </Switch>
 
                 {this.state.popupvisible ?
-                    <NewTagPopup show={this.state.popupvisible}
-                                 onHide={(): void => {
-                                     this.setState({popupvisible: false});
-                                     // this.loadTags();
-                                 }}/> :
+                    <NewTagPopup onHide={(): void => {
+                        this.setState({popupvisible: false});
+                        // this.loadTags();
+                    }}/> :
                     null
                 }
             </>

src/pages/CategoryPage/CategoryView.tsx

@@ -1,9 +1,9 @@
 import {RouteComponentProps} from 'react-router';
 import React from 'react';
-import {VideoUnloadedType} from '../../api/VideoTypes';
 import VideoContainer from '../../elements/VideoContainer/VideoContainer';
 import {callAPI} from '../../utils/Api';
 import {withRouter} from 'react-router-dom';
+import {VideoTypes} from '../../types/ApiTypes';
 
 interface CategoryViewProps extends RouteComponentProps<{ id: string }> {
     setSubTitle: (title: string) => void
@@ -17,7 +17,7 @@ interface CategoryViewState {
  * plain class (for unit testing only)
  */
 export class CategoryView extends React.Component<CategoryViewProps, CategoryViewState> {
-    private videodata: VideoUnloadedType[] = [];
+    private videodata: VideoTypes.VideoUnloadedType[] = [];
 
     constructor(props: CategoryViewProps) {
         super(props);
@@ -60,7 +60,7 @@ export class CategoryView extends React.Component<CategoryViewProps, CategoryVie
      * @param id tagid
      */
     fetchVideoData(id: number): void {
-        callAPI<VideoUnloadedType[]>('video.php', {action: 'getMovies', tag: id}, result => {
+        callAPI<VideoTypes.VideoUnloadedType[]>('video.php', {action: 'getMovies', tag: id}, result => {
             this.videodata = result;
             this.setState({loaded: true});
             this.props.setSubTitle(this.videodata.length + ' Videos');

src/pages/CategoryPage/TagView.tsx

@@ -1,4 +1,4 @@
-import {TagType} from '../../api/VideoTypes';
+import {TagType} from '../../types/VideoTypes';
 import React from 'react';
 import videocontainerstyle from '../../elements/VideoContainer/VideoContainer.module.css';
 import {Link} from 'react-router-dom';
@@ -32,8 +32,7 @@ class TagView extends React.Component<props, TagViewState> {
                         this.state.loadedtags.map((m) => (
                             <Link to={'/categories/' + m.tag_id}><TagPreview
                                 key={m.tag_id}
-                                name={m.tag_name}
-                                tag_id={m.tag_id}/></Link>
+                                name={m.tag_name}/></Link>
                         )) :
                         'loading'}
                 </div>