Skip to content

Commit 3742504

Browse files
author
Paul Johnston
committed
Partition to finer-grained dependencies
1 parent 5886acb commit 3742504

7 files changed

Lines changed: 100 additions & 119 deletions

File tree

‎js/ui/BUILD‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,30 @@ load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_
55
closure_js_library(
66
name = "component",
77
srcs = [
8+
"app.js",
89
"component.js",
10+
"route.js",
11+
"route/event.js",
12+
"router.js",
913
],
1014
deps = [
15+
":history",
16+
":keyboard",
17+
":injector",
1118
"@io_bazel_rules_closure//closure/library/asserts",
19+
"@io_bazel_rules_closure//closure/library/dom",
20+
"@io_bazel_rules_closure//closure/library/events:event",
21+
"@io_bazel_rules_closure//closure/library/events:eventhandler",
22+
"@io_bazel_rules_closure//closure/library/events:eventtarget",
1223
"@io_bazel_rules_closure//closure/library/fx:dom",
1324
"@io_bazel_rules_closure//closure/library/fx:easing",
25+
"@io_bazel_rules_closure//closure/library/history:eventtype",
26+
"@io_bazel_rules_closure//closure/library/object",
27+
"@io_bazel_rules_closure//closure/library/promise",
1428
"@io_bazel_rules_closure//closure/library/string",
1529
"@io_bazel_rules_closure//closure/library/style",
1630
"@io_bazel_rules_closure//closure/library/ui:component",
31+
"@io_bazel_rules_closure//closure/library/ui:control",
1732
],
1833
)
1934

@@ -37,27 +52,6 @@ closure_js_library(
3752
],
3853
)
3954

40-
closure_js_library(
41-
name = "routing",
42-
srcs = [
43-
"route.js",
44-
"route/event.js",
45-
"router.js",
46-
],
47-
deps = [
48-
":component",
49-
":history",
50-
"@io_bazel_rules_closure//closure/library/asserts",
51-
"@io_bazel_rules_closure//closure/library/promise",
52-
"@io_bazel_rules_closure//closure/library/events:event",
53-
"@io_bazel_rules_closure//closure/library/events:eventhandler",
54-
"@io_bazel_rules_closure//closure/library/events:eventtarget",
55-
"@io_bazel_rules_closure//closure/library/ui:component",
56-
# "@io_bazel_rules_closure//closure/library/ui:all_js",
57-
# "@io_bazel_rules_closure//closure/protobuf:jspb",
58-
],
59-
)
60-
6155
closure_js_library(
6256
name = "keyboard",
6357
srcs = [
@@ -131,18 +125,35 @@ closure_js_library(
131125
],
132126
)
133127

128+
# closure_js_library(
129+
# name = "app",
130+
# srcs = [
131+
# ],
132+
# deps = [
133+
# ":component",
134+
# ],
135+
# )
136+
134137
closure_js_library(
135-
name = "ui",
138+
name = "injector",
136139
srcs = [
137-
"app.js",
138140
"injector.js",
139141
],
140142
deps = [
143+
# ":component",
144+
],
145+
)
146+
147+
closure_js_library(
148+
name = "ui",
149+
# srcs = [
150+
# ],
151+
exports = [
152+
":injector",
141153
":component",
142154
":history",
143155
":keyboard",
144156
":menushield",
145-
":routing",
146157
":select",
147158
":syntax",
148159
":template",
@@ -173,25 +184,11 @@ closure_js_test(
173184
"route_test.js",
174185
],
175186
entry_points = ["goog:stack.ui.RouteTest"],
176-
suppress = [
177-
"reportUnknownTypes",
178-
],
179-
deps = [
180-
":ui",
181-
"@io_bazel_rules_closure//closure/library",
182-
"@io_bazel_rules_closure//closure/library:testing",
183-
],
184-
)
185-
186-
closure_js_test(
187-
name = "select_test",
188-
srcs = [
189-
"select_test.js",
190-
],
191-
entry_points = ["goog:stack.ui.SelectTest"],
192187
deps = [
193-
":ui",
194-
"@io_bazel_rules_closure//closure/library",
188+
":component",
189+
":select",
190+
":app",
191+
# "@io_bazel_rules_closure//closure/library",
195192
"@io_bazel_rules_closure//closure/library:testing",
196193
],
197194
)
@@ -203,8 +200,11 @@ closure_js_test(
203200
],
204201
entry_points = ["goog:stack.ui.HistoryTest"],
205202
deps = [
206-
":ui",
207-
"@io_bazel_rules_closure//closure/library",
203+
":history",
204+
"@io_bazel_rules_closure//closure/library/dom",
205+
"@io_bazel_rules_closure//closure/library/dom:tagname",
206+
"@io_bazel_rules_closure//closure/library/events",
207+
"@io_bazel_rules_closure//closure/library/string",
208208
"@io_bazel_rules_closure//closure/library:testing",
209209
],
210210
)

‎js/ui/component.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ goog.module('stack.ui.Component');
66
const BgColorTransform = goog.require('goog.fx.dom.BgColorTransform');
77
const ComponentEventType = goog.require('goog.ui.Component.EventType');
88
const GoogUiComponent = goog.require('goog.ui.Component');
9+
const Route = goog.require('stack.ui.Route');
910
const asserts = goog.require('goog.asserts');
1011
const easing = goog.require('goog.fx.easing');
1112
const strings = goog.require('goog.string');
@@ -31,7 +32,6 @@ class Component extends GoogUiComponent {
3132

3233
/**
3334
* @param {string} name
34-
* @suppress {checkDebuggerStatement}
3535
*/
3636
setName(name) {
3737
this.name_ = name;
@@ -82,7 +82,7 @@ class Component extends GoogUiComponent {
8282
}
8383

8484
/**
85-
* @param {!stack.ui.Route} route
85+
* @param {!Route} route
8686
*/
8787
go(route) {
8888
route.progress(this);
@@ -95,15 +95,15 @@ class Component extends GoogUiComponent {
9595
}
9696

9797
/**
98-
* @param {!stack.ui.Route} route
98+
* @param {!Route} route
9999
*/
100100
goHere(route) {
101101
this.show();
102102
route.done(this);
103103
}
104104

105105
/**
106-
* @param {!stack.ui.Route} route
106+
* @param {!Route} route
107107
*/
108108
goDown(route) {
109109
// console.warn(`Component ${this.getName()} failed at ${route.peek()}`);
@@ -282,7 +282,6 @@ class Component extends GoogUiComponent {
282282
fx.play();
283283
}
284284

285-
286285
/**
287286
* @param {string} src
288287
*/

‎js/ui/history.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class History extends EventTarget {
101101
handleNavigate(e) {
102102
var target = this.history_.getToken();
103103
// target = decodeURIComponent(target);
104-
// console.log("handleNavigate target=", target, this.history_.getToken());
104+
//console.log(`handleNavigate target = "${target}", token="${this.history_.getToken()}"`);
105105
if (target != this.current_) {
106106
this.dispatchEvent(e);
107107
} else {

‎js/ui/history/event.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ class HEvent extends GoogEvent {
1616
*/
1717
constructor(eventType, path) {
1818
super(eventType);
19+
1920
/** @public @type {string} */
2021
this.path = path;
22+
2123
}
2224

2325
}

‎js/ui/history_test.js‎

Lines changed: 48 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,16 @@ const HEvent = goog.require('stack.ui.history.Event');
2020
const TagName = goog.require('goog.dom.TagName');
2121
const dom = goog.require('goog.dom');
2222
const events = goog.require('goog.events');
23-
const jsunit = goog.require('goog.testing.jsunit');
23+
// const jsunit = goog.require('goog.testing.jsunit');
2424
const strings = goog.require('goog.string');
2525
const testSuite = goog.require('goog.testing.testSuite');
2626

2727
/** @type {?BzlHistory} */
2828
let history = null;
2929

30-
/** @type {!Array<!HEvent>} */
31-
let eventStack = [];
32-
3330
testSuite({
3431

3532
setUp: () => {
36-
console.log('======================================================', jsunit);
3733
history = new BzlHistory();
3834
},
3935

@@ -46,49 +42,72 @@ testSuite({
4642
},
4743

4844

49-
/**
50-
* Should not trigger nagivate event as the hash does not start with /#/.
51-
*/
52-
testDocumentClickNormalHrefDoesNotTriggersNavigate: () => {
53-
assertNotNull(history);
54-
events.listen(history, 'navigate', handleEvent);
55-
const a = createAnchor("/foo");
56-
document.body.appendChild(a);
57-
a.click();
58-
assertEquals(0, eventStack.length);
59-
},
45+
// /**
46+
// * Should not trigger nagivate event as the hash does not start with /#/.
47+
// */
48+
// testDocumentClickNormalHrefDoesNotTriggersNavigate: () => {
49+
// assertNotNull(history);
50+
// events.listen(history, 'navigate', handleEvent);
51+
// const a = createAnchor("/foo");
52+
// document.body.appendChild(a);
53+
// a.click();
54+
// assertEquals(0, eventStack.length);
55+
// },
6056

6157

6258
/**
6359
* Should trigger nagivate event as the hash does not start with /#/.
60+
* @suppress {checkTypes}
6461
*/
6562
testDocumentClickSpecialHrefTriggersNavigate: () => {
6663
assertNotNull(history);
67-
events.listen(history, 'navigate', handleEvent);
64+
65+
/** @type {!Array<!HEvent>} */
66+
let eventStack = [];
67+
68+
events.listen(history, 'navigate', (/** !HEvent */e) => {
69+
eventStack.push(e);
70+
});
71+
6872
const a = createAnchor("/#/foo/bar/baz");
6973
document.body.appendChild(a);
7074
a.click();
75+
76+
console.log(`eventstack.length ${eventStack.length}`);
77+
7178
assertEquals(1, eventStack.length);
7279
const event = eventStack[0];
7380
assertNotNull(event);
81+
82+
console.log(`typeof event ${typeof event}`);
83+
console.log(`event keys ${Object.keys(event)}`);
84+
console.log(`event.type ${event.type}`);
85+
console.log(`event.target ${event.target}`);
86+
// console.log(`event.$b$ ${event["$b$"]}`);
87+
// console.log(`event.$c$ ${event["$c$"]}`);
88+
console.log(`typeof event.path ${typeof event.path}`);
89+
90+
for (const key of Object.keys(event)) {
91+
console.log(`${key} = ${event[key]}`);
92+
}
93+
94+
console.log(`event.path.length ${event.path.length}`);
95+
96+
// Seems to be a disconnect in the transpilation here, I can't access the
97+
// path variable but it does seem to exist as $b$.
7498
assertNotNull(event.path);
75-
assertEquals(3, event.path.length);
76-
assertEquals("foo", event.path[0]);
77-
assertEquals("bar", event.path[1]);
78-
assertEquals("baz", event.path[2]);
99+
100+
assertEquals(4, event.path.length);
101+
assertEquals("", event.path[0]);
102+
assertEquals("foo", event.path[1]);
103+
assertEquals("bar", event.path[2]);
104+
assertEquals("baz", event.path[3]);
105+
79106
},
80107

81108
});
82109

83110

84-
/**
85-
* @param {!HEvent} e
86-
*/
87-
function handleEvent(e) {
88-
eventStack.push(e);
89-
}
90-
91-
92111
/**
93112
* @param {string} href
94113
* @return {!HTMLAnchorElement}

‎js/ui/keyboard.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ class Keyboard extends Disposable {
8989
* @param {boolean} b
9090
*/
9191
setEnabled(b) {
92+
this.shortcuts_.unregisterAll();
9293
if (b) {
9394
this.shortcutMap_.forEach(v => this.shortcuts_.registerShortcut(v.id, v.var_args));
94-
} else {
95-
this.shortcuts_.unregisterAll();
9695
}
9796
this.isEnabled_ = b;
9897
}

‎js/ui/select_test.js‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)