Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"jsnext:main": "dist/es/index.js",
"license": "MIT",
"scripts": {
"build:types": "flow-copy-source --ignore \"**/*.{jest,e2e,example}.js\" source/WindowScroller dist/es/WindowScroller",
"build:types": "flow-copy-source --ignore \"**/*.{jest,e2e,example}.js\" source/WindowScroller dist/es/WindowScroller && flow-copy-source --ignore \"**/*.{jest,e2e,example}.js\" source/AutoSizer dist/es/AutoSizer",
"build": "npm run build:commonjs && npm run build:css && npm run build:es && npm run build:demo && npm run build:umd",
"build:commonjs": "npm run clean:commonjs && cross-env NODE_ENV=production cross-env BABEL_ENV=commonjs babel source --out-dir dist/commonjs",
"build:css": "postcss source/styles.css -o styles.css --use autoprefixer",
Expand All @@ -27,7 +27,7 @@
"deploy": "gh-pages -d build",
"lint": "eslint 'source/**/*.js'",
"typecheck": "flow check",
"prebuild": "npm run typecheck && npm run lint",
"postbuild": "npm run typecheck && npm run lint",
"prettier": "prettier --write '{playground,source}/**/*.js'",
"prettier:diff": "prettier --list-different '{playground,source}/**/*.js'",
"postpublish": "npm run deploy",
Expand Down
35 changes: 23 additions & 12 deletions source/AutoSizer/AutoSizer.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
/** @flow */

import type {Size} from './types';
'no babel-plugin-flow-react-proptypes';

import * as React from 'react';
import PropTypes from 'prop-types';
import createDetectElementResize from '../vendor/detectElementResize';

export type Size = {
height: number,
width: number,
};

type Props = {
/** Function responsible for rendering children.*/
children: (warams: Size) => React.Element<*>,
children: Size => React.Element<*>,

/** Default height to use for initial render; useful for SSR */
defaultHeight?: number,
Expand All @@ -25,12 +31,7 @@ type Props = {
nonce?: string,

/** Callback to be invoked on-resize */
onResize: (params: Size) => void,
};

type State = {
height: number,
width: number,
onResize: Size => void,
};

type ResizeHandler = (element: HTMLElement, onResize: () => void) => void;
Expand All @@ -40,7 +41,17 @@ type DetectElementResize = {
removeResizeListener: ResizeHandler,
};

export default class AutoSizer extends React.PureComponent<Props, State> {
export default class AutoSizer extends React.PureComponent<Props, Size> {
static propTypes = {
children: PropTypes.func.isRequired,
defaultHeight: PropTypes.number,
defaultWidth: PropTypes.number,
disableHeight: PropTypes.bool.isRequired,
disableWidth: PropTypes.bool.isRequired,
nonce: PropTypes.string,
onResize: PropTypes.func.isRequired,
};

static defaultProps = {
onResize: () => {},
disableHeight: false,
Expand Down Expand Up @@ -92,8 +103,8 @@ export default class AutoSizer extends React.PureComponent<Props, State> {
// Outer div should not force width/height since that may prevent containers from shrinking.
// Inner component should overflow and use calculated width/height.
// See issue #68 for more information.
const outerStyle: any = {overflow: 'visible'};
const childParams: any = {};
const outerStyle: Object = {overflow: 'visible'};
const childParams = {};

if (!disableHeight) {
outerStyle.height = 0;
Expand Down Expand Up @@ -159,7 +170,7 @@ export default class AutoSizer extends React.PureComponent<Props, State> {
}
};

_setRef = (autoSizer: HTMLElement | null) => {
_setRef = (autoSizer: ?HTMLElement) => {
this._autoSizer = autoSizer;
};
}
2 changes: 1 addition & 1 deletion source/AutoSizer/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow

export type {Size} from './types';
export type {Size} from './AutoSizer';

export {default} from './AutoSizer';
export {default as AutoSizer} from './AutoSizer';
6 changes: 0 additions & 6 deletions source/AutoSizer/types.js

This file was deleted.