Skip to content

Enabling various Typescript Compile Options (strict null checks, etc.) #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 19, 2017
Merged

Enabling various Typescript Compile Options (strict null checks, etc.) #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2108cb7
Rename #1 for ViewBase to fix caps
Sep 18, 2017
aa15d5a
Rename #2 to fix ViewBase. Enabling forceConsistentCasingInFileNames.
Sep 18, 2017
80c7f27
Enabling noImplicitReturns, fixing a bug in native-common/Linking.ts
Sep 18, 2017
26b18a8
Enabling noImplicitThis
Sep 18, 2017
dadc49e
Enabling noUnusedLocals and fixing some bugs it found
Sep 18, 2017
bb06b99
Enabling strict null checks on reactxp
Sep 18, 2017
5f3c18c
Addressing PR feedback
Sep 18, 2017
0fcb7eb
Fixing a bunch of type exporting/checking issues
Sep 18, 2017
4099766
Fixed a bunch of base interfaces and made everything inherit from the…
Sep 19, 2017
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"react-native-windows": "^0.33.0"
},
"devDependencies": {
"typescript": "2.4.1",
"tslint": "^5.0.0",
"tslint-microsoft-contrib": "^5.0.1"
"typescript": "2.6.0-dev.20170826",
"tslint": "5.4.3",
"tslint-microsoft-contrib": "5.0.0"
},
"homepage": "https://microsoft.github.io/reactxp/",
"repository": {
Expand Down
2 changes: 0 additions & 2 deletions src/android/Image.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import RN = require('react-native');

import { Image as CommonImage } from '../native-common/Image';
import Styles from '../native-common/Styles';
import Types = require('../common/Types');

export class Image extends CommonImage {
// Overwrite the style for android since native Image has a fade in animation when an image loads
Expand Down
184 changes: 92 additions & 92 deletions src/android/ReactXP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,43 @@
*/

import React = require('react');
import RXInterface = require('../common/Interfaces');
import RXTypes = require('../common/Types');

import AnimatedImpl = require('./Animated');
import RXInterfaces = require('../common/Interfaces');
import RXModuleInterface = require('../common/ModuleInterface');
import RXTypes = require('../common/Types');

// -- STRANGE THINGS GOING ON HERE --
// See web/ReactXP.tsx for more details.

import { default as AccessibilityImpl, Accessibility as AccessibilityType } from '../native-common/Accessibility';
import { default as ActivityIndicatorImpl, ActivityIndicator as ActivityIndicatorType } from '../native-common/ActivityIndicator';
import { default as AlertImpl, Alert as AlertType } from '../native-common/Alert';
import { default as AppImpl, App as AppType } from '../native-common/App';
import { default as ButtonImpl, Button as ButtonType } from '../native-common/Button';
import { default as PickerImpl, Picker as PickerType } from '../native-common/Picker';
import { default as ImageImpl, Image as ImageType } from './Image';
import { default as ClipboardImpl, Clipboard as ClipboardType } from '../native-common/Clipboard';
import { default as GestureViewImpl, GestureView as GestureViewType } from './GestureView';
import { default as InputImpl, Input as InputType } from '../native-common/Input';
import { default as InternationalImpl, International as InternationalType } from '../native-common/International';
import { default as LinkImpl, Link as LinkType } from '../native-common/Link';
import { default as LinkingImpl, Linking as LinkingType } from '../native-common/Linking';
import { default as LocationImpl, Location as LocationType } from '../common/Location';
import { default as ModalImpl, Modal as ModalType } from '../native-common/Modal';
import { default as NetworkImpl, Network as NetworkType } from '../native-common/Network';
import { default as PlatformImpl, Platform as PlatformType } from '../native-common/Platform';
import { default as PopupImpl, Popup as PopupType } from '../native-common/Popup';
import { default as ScrollViewImpl, ScrollView as ScrollViewType } from '../native-common/ScrollView';
import { default as StatusBarImpl, StatusBar as StatusBarType } from './StatusBar';
import { default as StorageImpl, Storage as StorageType } from '../native-common/Storage';
import { default as StylesImpl, Styles as StylesType } from '../native-common/Styles';
import { default as TextImpl, Text as TextType } from './Text';
import { default as TextInputImpl, TextInput as TextInputType } from '../native-common/TextInput';
import { default as UserInterfaceImpl, UserInterface as UserInterfaceType } from '../native-common/UserInterface';
import { default as UserPresenceImpl, UserPresence as UserPresenceType } from '../native-common/UserPresence';
import { default as ViewImpl, View as ViewType } from '../native-common/View';
import { default as WebViewImpl, WebView as WebViewType } from '../native-common/WebView';
import AccessibilityImpl from '../native-common/Accessibility';
import ActivityIndicatorImpl from '../native-common/ActivityIndicator';
import AlertImpl from '../native-common/Alert';
import AppImpl from '../native-common/App';
import ButtonImpl from '../native-common/Button';
import PickerImpl from '../native-common/Picker';
import ImageImpl from './Image';
import ClipboardImpl from '../native-common/Clipboard';
import GestureViewImpl from './GestureView';
import InputImpl from '../native-common/Input';
import InternationalImpl from '../native-common/International';
import LinkImpl from '../native-common/Link';
import LinkingImpl from '../native-common/Linking';
import LocationImpl from '../common/Location';
import ModalImpl from '../native-common/Modal';
import NetworkImpl from '../native-common/Network';
import PlatformImpl from '../native-common/Platform';
import PopupImpl from '../native-common/Popup';
import ScrollViewImpl from '../native-common/ScrollView';
import StatusBarImpl from './StatusBar';
import StorageImpl from '../native-common/Storage';
import StylesImpl from '../native-common/Styles';
import TextImpl from './Text';
import TextInputImpl from '../native-common/TextInput';
import UserInterfaceImpl from '../native-common/UserInterface';
import UserPresenceImpl from '../native-common/UserPresence';
import ViewImpl from '../native-common/View';
import WebViewImpl from '../native-common/WebView';
import ViewBase from '../native-common/ViewBase';

// Initialize the Android default view style. This is should not be required because RN for
Expand All @@ -66,64 +68,64 @@ AccessibilityUtil.setAccessibilityPlatformUtil(AccessibilityPlatformUtil);
// See web/ReactXP.tsx for more details.

module ReactXP {
export type Accessibility = AccessibilityType;
export var Accessibility = AccessibilityImpl;
export import Animated = AnimatedImpl.Animated;
export type ActivityIndicator = ActivityIndicatorType;
export var ActivityIndicator = ActivityIndicatorImpl;
export type Alert = AlertType;
export var Alert = AlertImpl;
export type App = AppType;
export var App = AppImpl;
export type Button = ButtonType;
export var Button = ButtonImpl;
export type Picker = PickerType;
export var Picker = PickerImpl;
export type Clipboard = ClipboardType;
export var Clipboard = ClipboardImpl;
export type GestureView = GestureViewType;
export var GestureView = GestureViewImpl;
export type Image = ImageType;
export var Image = ImageImpl;
export type Input = InputType;
export var Input = InputImpl;
export type International = InternationalType;
export var International = InternationalImpl;
export type Link = LinkType;
export var Link = LinkImpl;
export type Linking = LinkingType;
export var Linking = LinkingImpl;
export type Location = LocationType;
export var Location = LocationImpl;
export type Modal = ModalType;
export var Modal = ModalImpl;
export type Network = NetworkType;
export var Network = NetworkImpl;
export type Platform = PlatformType;
export var Platform = PlatformImpl;
export type Popup = PopupType;
export var Popup = PopupImpl;
export type ScrollView = ScrollViewType;
export var ScrollView = ScrollViewImpl;
export type StatusBar = StatusBarType;
export var StatusBar = StatusBarImpl;
export type Storage = StorageType;
export var Storage = StorageImpl;
export type Styles = StylesType;
export var Styles = StylesImpl;
export type Text = TextType;
export var Text = TextImpl;
export type TextInput = TextInputType;
export var TextInput = TextInputImpl;
export type UserInterface = UserInterfaceType;
export var UserInterface = UserInterfaceImpl;
export type UserPresence = UserPresenceType;
export var UserPresence = UserPresenceImpl;
export type View = ViewType;
export var View = ViewImpl;
export type WebView = WebViewType;
export var WebView = WebViewImpl;
export type Accessibility = RXInterfaces.Accessibility;
export var Accessibility: RXInterfaces.Accessibility = AccessibilityImpl;
export type ActivityIndicator = RXInterfaces.ActivityIndicator;
export var ActivityIndicator: typeof RXInterfaces.ActivityIndicator = ActivityIndicatorImpl;
export type Alert = RXInterfaces.Alert;
export var Alert: RXInterfaces.Alert = AlertImpl;
export type App = RXInterfaces.App;
export var App: RXInterfaces.App = AppImpl;
export type Button = RXInterfaces.Button;
export var Button: typeof RXInterfaces.Button = ButtonImpl;
export type Picker = RXInterfaces.Picker;
export var Picker: typeof RXInterfaces.Picker = PickerImpl;
export type Clipboard = RXInterfaces.Clipboard;
export var Clipboard: RXInterfaces.Clipboard = ClipboardImpl;
export type GestureView = RXInterfaces.GestureView;
export var GestureView: typeof RXInterfaces.GestureView = GestureViewImpl;
export type Image = RXInterfaces.Image;
export var Image: RXInterfaces.ImageConstructor = ImageImpl;
export type Input = RXInterfaces.Input;
export var Input: RXInterfaces.Input = InputImpl;
export type International = RXInterfaces.International;
export var International: RXInterfaces.International = InternationalImpl;
export type Link = RXInterfaces.Link;
export var Link: typeof RXInterfaces.Link = LinkImpl;
export type Linking = RXInterfaces.Linking;
export var Linking: RXInterfaces.Linking = LinkingImpl;
export type Location = RXInterfaces.Location;
export var Location: RXInterfaces.Location = LocationImpl;
export type Modal = RXInterfaces.Modal;
export var Modal: RXInterfaces.Modal = ModalImpl;
export type Network = RXInterfaces.Network;
export var Network: RXInterfaces.Network = NetworkImpl;
export type Platform = RXInterfaces.Platform;
export var Platform: RXInterfaces.Platform = PlatformImpl;
export type Popup = RXInterfaces.Popup;
export var Popup: RXInterfaces.Popup = PopupImpl;
export type ScrollView = RXInterfaces.ScrollView;
export var ScrollView: RXInterfaces.ScrollViewConstructor = ScrollViewImpl;
export type StatusBar = RXInterfaces.StatusBar;
export var StatusBar: RXInterfaces.StatusBar = StatusBarImpl;
export type Storage = RXInterfaces.Storage;
export var Storage: RXInterfaces.Storage = StorageImpl;
export type Styles = RXInterfaces.Styles;
export var Styles: RXInterfaces.Styles = StylesImpl;
export type Text = RXInterfaces.Text;
export var Text: typeof RXInterfaces.Text = TextImpl;
export type TextInput = RXInterfaces.TextInput;
export var TextInput: typeof RXInterfaces.TextInput = TextInputImpl;
export type UserInterface = RXInterfaces.UserInterface;
export var UserInterface: RXInterfaces.UserInterface = UserInterfaceImpl;
export type UserPresence = RXInterfaces.UserPresence;
export var UserPresence: RXInterfaces.UserPresence = UserPresenceImpl;
export type View = RXInterfaces.View;
export var View: typeof RXInterfaces.View = ViewImpl;
export type WebView = RXInterfaces.WebView;
export var WebView: RXInterfaces.WebViewConstructor = WebViewImpl;

export import Animated = AnimatedImpl;
export import CommonProps = RXTypes.CommonProps;
export import CommonStyledProps = RXTypes.CommonStyledProps;
export import Types = RXTypes;
Expand All @@ -134,14 +136,12 @@ module ReactXP {
export var __spread = (React as any).__spread;
}

export = ReactXP;

// -- STRANGE THINGS GOING ON HERE --
// See web/ReactXP.tsx for more details.

/* tslint:disable:no-unused-variable */
var _rxImplementsRxInterface: RXInterface.ReactXP = ReactXP;
/* tslint:enable:no-unused-variable */
var _rxImplementsRxInterface: typeof RXModuleInterface.ReactXP = ReactXP;
_rxImplementsRxInterface = _rxImplementsRxInterface;
export = ReactXP;

/*
var rx = module.exports;
Expand Down
6 changes: 3 additions & 3 deletions src/android/Text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ var _styles = {
};

export class Text extends CommonText {
protected _getStyles(): Types.TextStyleRuleSet | Types.TextStyleRuleSet[] {
return Styles.combine<Types.TextStyle>([_styles.defaultText, this.props.style]);
protected _getStyles(): Types.StyleRuleSetRecursiveArray<Types.TextStyleRuleSet> {
return [_styles.defaultText, this.props.style];
}

// We override the render method to work around a couple of Android-specific
Expand All @@ -38,7 +38,7 @@ export class Text extends CommonText {
style={ this._getStyles() }
ref='nativeText'
importantForAccessibility={ importantForAccessibility }
numberOfLines={ this.props.numberOfLines === 0 ? null : this.props.numberOfLines }
numberOfLines={ this.props.numberOfLines === 0 ? undefined : this.props.numberOfLines }
allowFontScaling={ this.props.allowFontScaling }
maxContentSizeMultiplier={ this.props.maxContentSizeMultiplier }
ellipsizeMode={ this.props.ellipsizeMode }
Expand Down
2 changes: 2 additions & 0 deletions src/common/Accessibility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import RX = require('../common/Interfaces');
export abstract class Accessibility extends RX.Accessibility {
abstract isScreenReaderEnabled(): boolean;

screenReaderChangedEvent = new SubscribableEvent<(isEnabled: boolean) => void>();

newAnnouncementReadyEvent = new SubscribableEvent<(announcement: string) => void>();
announceForAccessibility(announcement: string): void {
this.newAnnouncementReadyEvent.fire(announcement);
Expand Down
14 changes: 7 additions & 7 deletions src/common/AccessibilityUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ export abstract class AccessibilityPlatformUtil {
}

export abstract class AccessibilityUtil {
isHidden(importantForAccessibility: Types.ImportantForAccessibility): boolean {
isHidden(importantForAccessibility: Types.ImportantForAccessibility|undefined): boolean {
if (importantForAccessibility) {
const importantForAccessibilityString = this.importantForAccessibilityToString(importantForAccessibility);
return importantForAccessibilityString === ImportantForAccessibilityMap[Types.ImportantForAccessibility.NoHideDescendants];
}
return undefined;
return false;
}

importantForAccessibilityToString(importantForAccessibility: Types.ImportantForAccessibility,
defaultImportantForAccessibility?: Types.ImportantForAccessibility): string {
importantForAccessibilityToString(importantForAccessibility: Types.ImportantForAccessibility|undefined,
defaultImportantForAccessibility?: Types.ImportantForAccessibility): string|undefined {
importantForAccessibility = importantForAccessibility || defaultImportantForAccessibility;

if (ImportantForAccessibilityMap[importantForAccessibility]) {
if (importantForAccessibility && ImportantForAccessibilityMap[importantForAccessibility]) {
return ImportantForAccessibilityMap[importantForAccessibility];
}
return undefined;
}

protected abstract accessibilityLiveRegionToString(liveRegion: Types.AccessibilityLiveRegion): string;
protected abstract accessibilityLiveRegionToString(liveRegion: Types.AccessibilityLiveRegion): string|undefined;
protected abstract accessibilityTraitToString(trait: Types.AccessibilityTrait | Types.AccessibilityTrait[],
defaultTrait?: Types.AccessibilityTrait): string | string[];
defaultTrait?: Types.AccessibilityTrait): string | string[] | undefined;
}
Loading