Skip to content
This repository has been archived by the owner on Dec 28, 2018. It is now read-only.

Commit

Permalink
Auto merge of #512 - saneyuki:stateless, r=<try>
Browse files Browse the repository at this point in the history
Enable Stateless Function Components infrastructure which TypeScript supports officially

the design details in TypeScript: microsoft/TypeScript#5478

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/karen-irc/karen/512)
<!-- Reviewable:end -->
  • Loading branch information
dokidokivisual committed Dec 2, 2015
2 parents ae71bda + 704f9a9 commit b4339b8
Show file tree
Hide file tree
Showing 4 changed files with 1,365 additions and 128 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"mocha": "^2.3.4",
"tsd": "^0.6.5",
"tslint": "3.1.0-dev.1",
"typescript": "1.8.0-dev.20151201",
"typescript": "1.8.0-dev.20151202",
"vinyl-source-stream": "^1.1.0"
}
}
4 changes: 2 additions & 2 deletions tsd.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"commit": "70737c2a2496f7a13c4da63eb00081cad94d19f1"
},
"react/react.d.ts": {
"commit": "fc341765ebbb04b7109981a25dced01f488f4d94"
"commit": "4910a7c52a1cf335877ea3b0917eb65117a66637"
},
"react/react-dom.d.ts": {
"commit": "fc341765ebbb04b7109981a25dced01f488f4d94"
"commit": "4910a7c52a1cf335877ea3b0917eb65117a66637"
}
}
}
13 changes: 6 additions & 7 deletions tsd/third_party/react/react-dom.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
/// <reference path="react.d.ts" />

declare namespace __React {

namespace __DOM {
function findDOMNode<E extends Element>(instance: ReactInstance): E;
function findDOMNode(instance: ReactInstance): Element;

function render<P>(
element: DOMElement<P>,
container: Element,
Expand All @@ -23,15 +22,15 @@ declare namespace __React {
element: ReactElement<P>,
container: Element,
callback?: (component: Component<P, S>) => any): Component<P, S>;

function unmountComponentAtNode(container: Element): boolean;

var version: string;

function unstable_batchedUpdates<A, B>(callback: (a: A, b: B) => any, a: A, b: B): void;
function unstable_batchedUpdates<A>(callback: (a: A) => any, a: A): void;
function unstable_batchedUpdates(callback: () => any): void;

function unstable_renderSubtreeIntoContainer<P>(
parentComponent: Component<any, any>,
nextElement: DOMElement<P>,
Expand All @@ -48,7 +47,7 @@ declare namespace __React {
container: Element,
callback?: (component: Component<P, S>) => any): Component<P, S>;
}

namespace __DOMServer {
function renderToString(element: ReactElement<any>): string;
function renderToStaticMarkup(element: ReactElement<any>): string;
Expand Down
Loading

0 comments on commit b4339b8

Please sign in to comment.