Skip to content

Commit

Permalink
Version 1.2.3 - Fixed bug with imports
Browse files Browse the repository at this point in the history
  • Loading branch information
tran-simon committed May 3, 2021
1 parent 03c63cf commit 8b23c48
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 118 deletions.
201 changes: 107 additions & 94 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,37 @@
"duration-picker",
"durations"
],
"version": "1.2.2",
"version": "1.2.3",
"license": "MIT",
"main": "dist/index.js",
"author": "tran-simon",
"repository": "https://github.com/tran-simon/material-duration-picker",
"peerDependencies": {
"@material-ui/core": "^4.9.1",
"@types/react": "^16.9.0",
"@types/react": "^16.8.4",
"@types/react-dom": "^16.9.0",
"react": "^16.0.0",
"react-dom": "^16.0.0"
"react": "^16.8.4",
"react-dom": "^16.8.4"
},
"devDependencies": {
"@material-ui/core": "^4.9.1",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@types/jest": "^26.0.23",
"@types/node": "^12.0.0",
"@types/react": "^16.8.4",
"@types/react-dom": "^16.9.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"ts-jest": "^26.5.5",
"typescript": "^4.2.4"
},
"scripts": {
"build": "tsc",
"start": "tsc -w",
"test": "jest",
"clean": "rm -rf dist"
"clean": "rm -rf dist",
"deploy": "npm run clean && npm install && npm run build && npm run test && npm publish"
},
"files": [
"dist"
Expand Down
12 changes: 0 additions & 12 deletions src/__tests__/__snapshots__/durationFieldsContainer.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ exports[`DurationFieldsContainer can match snapshot 1`] = `
<div
class="MuiFormControl-root MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
data-shrink="true"
>
Minutes
</label>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
>
Expand All @@ -36,12 +30,6 @@ exports[`DurationFieldsContainer can match snapshot 1`] = `
<div
class="MuiFormControl-root MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
data-shrink="true"
>
Seconds
</label>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-formControl MuiInput-formControl"
>
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/durationFieldsContainer.test.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 {render, waitFor, screen, fireEvent} from '@testing-library/react'
import {DurationFieldsContainer, DurationFieldsContainerProps} from "../durationFieldsContainer";

Expand Down
3 changes: 2 additions & 1 deletion src/durationDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {useEffect, useState} from "react";
import * as React from 'react'
import {useEffect, useState} from 'react'
import {Button, Dialog, DialogActions, DialogContent, DialogProps, Toolbar, Typography, useTheme} from "@material-ui/core";
import {DurationType, DurationView, Labels} from "./types";
import {DurationFieldsContainer, DurationFieldsContainerProps} from "./durationFieldsContainer";
Expand Down
3 changes: 2 additions & 1 deletion src/durationField.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {TextField, TextFieldProps} from "@material-ui/core";
import React, {useEffect, useState} from "react";
import * as React from 'react'
import {useEffect, useState} from "react";

export type DurationFieldProps = TextFieldProps & {
value: number | null
Expand Down
5 changes: 3 additions & 2 deletions src/durationFieldsContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import {Grid, GridProps} from '@material-ui/core';
import React, {Dispatch} from 'react'
import * as React from 'react'
import {Dispatch} from 'react'
import {DurationField, DurationFieldProps} from "./durationField";
import {DurationType, DurationView, Labels} from "./types";
import DefaultLabels from "./defaultLabelsEn.json";
import {getDurationOverflow, VIEWS} from "./utils";
import {getDurationOverflow} from "./utils";


export type DurationFieldsContainerProps = {
Expand Down
3 changes: 2 additions & 1 deletion src/durationPicker.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {useState} from "react";
import * as React from 'react'
import {useState} from "react";
import {TextField, TextFieldProps} from "@material-ui/core";
import {durationToTime, timeToDuration} from "./utils";
import {DurationDialog, DurationDialogProps} from "./durationDialog";
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "CommonJS",
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
Expand Down

0 comments on commit 8b23c48

Please sign in to comment.