diff --git a/javascripts/src/components/common/Modal.tsx b/javascripts/src/components/common/Modal.tsx index 7c04dc1d..ceb437d5 100644 --- a/javascripts/src/components/common/Modal.tsx +++ b/javascripts/src/components/common/Modal.tsx @@ -2,9 +2,6 @@ import * as React from 'react'; import { observer } from 'mobx-react'; import AriaModal = require('react-aria-modal'); -import { VelocityTransitionGroup } from 'velocity-react'; -import 'velocity-animate'; -import 'velocity-animate/velocity.ui'; import { DefaultCloseButton } from './DefaultCloseButton'; import BootstrapWrapper from './BootstrapWrapper'; import { Row, Column } from './layout'; @@ -27,7 +24,7 @@ class Modal extends React.Component { } render() { - const innerModal = this.props.modalActive ?
{ : false - const modal = - - {innerModal} - ; - return modal } diff --git a/javascripts/src/components/common/Spinner.tsx b/javascripts/src/components/common/Spinner.tsx index dc530466..0d11033f 100644 --- a/javascripts/src/components/common/Spinner.tsx +++ b/javascripts/src/components/common/Spinner.tsx @@ -1,7 +1,6 @@ // License: LGPL-3.0-or-later import { Color } from 'csstype'; import * as React from 'react'; -import { VelocityComponent } from 'velocity-react'; import ScreenReaderOnlyText from './ScreenReaderOnlyText'; export interface SpinnerProps { @@ -41,11 +40,9 @@ class Spinner extends React.Component { } render() { - return -
+ return
Loading...
- ; } } diff --git a/javascripts/src/components/common/__snapshots__/Modal.spec.tsx.snap b/javascripts/src/components/common/__snapshots__/Modal.spec.tsx.snap index 9ab548a2..f00df333 100644 --- a/javascripts/src/components/common/__snapshots__/Modal.spec.tsx.snap +++ b/javascripts/src/components/common/__snapshots__/Modal.spec.tsx.snap @@ -14,441 +14,357 @@ exports[`Modal active modal displays matches snapshot 1`] = ` showCloseButton={true} titleText="title text" > - - -
- - -
-
+
+
+ +
+
+ } + > + + - +
+
- -
+
-
+
+
+
+
- - - - - - - - + + + + + + + + `; -exports[`Modal nothing displayed if inactive 1`] = ` - -`; +exports[`Modal nothing displayed if inactive 1`] = `""`; diff --git a/javascripts/src/components/common/__snapshots__/Spinner.spec.tsx.snap b/javascripts/src/components/common/__snapshots__/Spinner.spec.tsx.snap index 4cb66665..9014bd65 100644 --- a/javascripts/src/components/common/__snapshots__/Spinner.spec.tsx.snap +++ b/javascripts/src/components/common/__snapshots__/Spinner.spec.tsx.snap @@ -5,53 +5,39 @@ exports[`Spinner has custom color 1`] = ` color="#ffffff" size="small" > - -
- - + - Loading... - - -
- + } + > + Loading... + + + `; @@ -60,53 +46,39 @@ exports[`Spinner is large 1`] = ` color="currentcolor" size="large" > - -
- - + - Loading... - - -
- + } + > + Loading... + + + `; @@ -115,53 +87,39 @@ exports[`Spinner is normal 1`] = ` color="currentcolor" size="normal" > - -
- - + - Loading... - - -
- + } + > + Loading... + + + `; @@ -170,52 +128,38 @@ exports[`Spinner is small 1`] = ` color="currentcolor" size="small" > - -
- - + - Loading... - - -
- + } + > + Loading... + + + `; diff --git a/package.json b/package.json index dd7b6f1a..b79b4775 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "@types/react-transition-group": "^2.9.0", "@types/sinon": "^4.3.3", "@types/validator": "^9.4.1", - "@types/velocity-animate": "^1.2.33", "babel-core": "^6.26.0", "babel-loader": "^8.0.6", "babel-preset-env": "^1.6.1", @@ -148,7 +147,6 @@ "uuid": "2.0.2", "validator": "^9.4.1", "vdom-thunk": "3.0.0", - "velocity-react": "^1.4.1", "view-script": "0.3.6", "virtual-dom": "2.1.1", "vvvview": "0.4.3" diff --git a/types/velocity-react/index.d.ts b/types/velocity-react/index.d.ts deleted file mode 100644 index 5c5d6cc3..00000000 --- a/types/velocity-react/index.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -// License: LGPL-3.0-or-later -declare module "velocity-react" -import * as React from 'react' -import * as Velocity from 'velocity-animate' -import 'velocity-animate/velocity.ui' - -type Animation = object|string -type TargetQuerySelector = "children" | string -interface VelocityComponentProps -{ - animation: Animation - runOnMount?: boolean - targetQuerySelector?: TargetQuerySelector -} - - -export declare class VelocityComponent extends React.Component -{ - runAnimation():void -} - -interface VelocityTransitionGroupProps { - enter: Animation - leave?: Animation - runOnMount?: boolean - style?: CSSProperties -} - -export declare class VelocityTransitionGroup extends React.Component { - static disabledForTest: boolean -} - - -export declare namespace velocityHelpers { - declare function registerEffect(animation:Animation) - declare function registerEffect(suffix:string, animation:Animation) -} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 164dce7d..d342d589 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1056,7 +1056,7 @@ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.3.tgz#0157c0316dc3722c43a7b71de3fdf3acbccef10d" integrity sha512-e74sM9W/4qqWB6D4TWV9FQk0WoHtX1X4FJpbjxucMSVJHtFjbQOH3H6yp+xno4br0AKG0wz/kPtaN599GUOvAg== -"@types/jquery@*", "@types/jquery@^3.3.1": +"@types/jquery@^3.3.1": version "3.3.31" resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz#27c706e4bf488474e1cb54a71d8303f37c93451b" integrity sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg== @@ -1171,13 +1171,6 @@ resolved "https://registry.yarnpkg.com/@types/validator/-/validator-9.4.4.tgz#67c745e988f721ea2a1e4cc5b4cd76e6bb3a76b1" integrity sha512-7bWNKQ3lDMhRS2lxe1aHGTBijZ/a6wQfZmCtKJDefpb81sYd+FrfNqj6Gda1Tcw8bYK0gG1CVuNLWV2JS7K8Dw== -"@types/velocity-animate@^1.2.33": - version "1.2.33" - resolved "https://registry.yarnpkg.com/@types/velocity-animate/-/velocity-animate-1.2.33.tgz#611fb5007fe32f02a9056114bc9254a37510c2d7" - integrity sha512-0UAWZSIAT7QE2kR1tcCJcfed3VY2m7VDbLhXEFt+5yog9mb+JSTAukBJVGOqptm5vuXJhvyOFzVkeNU4mjqcvg== - dependencies: - "@types/jquery" "*" - "@types/yargs-parser@*": version "13.1.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" @@ -9769,7 +9762,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.6, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -10072,7 +10065,7 @@ react-text-mask@^5.3.0: dependencies: prop-types "^15.5.6" -react-transition-group@^2.0.0, react-transition-group@^2.9.0: +react-transition-group@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d" integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg== @@ -11996,21 +11989,6 @@ vdom-thunk@3.0.0: resolved "https://registry.yarnpkg.com/vdom-thunk/-/vdom-thunk-3.0.0.tgz#3662156df6ee64da2e7d639ed5b4f01daf875812" integrity sha1-NmIVbfbuZNoufWOe1bTwHa+HWBI= -velocity-animate@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105" - integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg== - -velocity-react@^1.4.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/velocity-react/-/velocity-react-1.4.3.tgz#63e41d92e334d5a3bea8b2fa02ee170f62ef4d36" - integrity sha512-zvefGm85A88S3KdF9/dz5vqyFLAiwKYlXGYkHH2EbXl+CZUD1OT0a0aS1tkX/WXWTa/FUYqjBaAzAEFYuSobBQ== - dependencies: - lodash "^4.17.5" - prop-types "^15.5.8" - react-transition-group "^2.0.0" - velocity-animate "^1.4.0" - vendors@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz#a6467781abd366217c050f8202e7e50cc9eef8c0"