crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: address PR feedback

Browse Source
This commit is contained in:
fragosti
2018-10-24 12:52:32 -07:00
parent 47737d4d0f
commit f89b314a94
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/instant/src/components/scaling_input.tsx
View File

@@ -53,7 +53,7 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
public state = {
inputWidthPxAtPhaseChange: undefined,
};
private readonly _inputRef = React.createRef();
private readonly _inputRef = React.createRef<HTMLInputElement>();
public static getPhase(textLengthThreshold: number, value: string): ScalingInputPhase {
if (value.length <= textLengthThreshold) {
return ScalingInputPhase.FixedFontSize;
@@ -101,8 +101,6 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
): void {
const prevPhase = ScalingInput.getPhaseFromProps(prevProps);
const curPhase = ScalingInput.getPhaseFromProps(this.props);
const prevFontSize = ScalingInput.calculateFontSizeFromProps(prevProps, prevPhase);
const curFontSize = ScalingInput.calculateFontSizeFromProps(this.props, curPhase);
// if we went from anything else to end, fix to the current width as it shouldn't change as we grow
if (prevPhase !== ScalingInputPhase.ScalingFontSize && curPhase === ScalingInputPhase.ScalingFontSize) {
this.setState({
@@ -115,6 +113,8 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
inputWidthPxAtPhaseChange: undefined,
});
}
const prevFontSize = ScalingInput.calculateFontSizeFromProps(prevProps, prevPhase);
const curFontSize = ScalingInput.calculateFontSizeFromProps(this.props, curPhase);
// If font size has changed, notify.
if (prevFontSize !== curFontSize) {
this.props.onFontSizeChange(curFontSize);
@@ -166,6 +166,6 @@ export class ScalingInput extends React.Component<ScalingInputProps, ScalingInpu
if (!ref) {
return 0;
}
return (ref as any).getBoundingClientRect().width;
return ref.getBoundingClientRect().width;
};
}

4
packages/instant/src/style/fonts.ts
View File

@@ -1,10 +1,10 @@
export const fonts = {
include: () => {
// Inject the inter-ui font into the page
const head = document.head || document.getElementsByTagName('head')[0];
const appendTo = document.head || document.getElementsByTagName('head')[0] || document.body;
const style = document.createElement('style');
style.type = 'text/css';
style.appendChild(document.createTextNode(`@import url('https://rsms.me/inter/inter-ui.css')`));
head.appendChild(style);
appendTo.appendChild(style);
},
};