Skip to content

Commit 638024b

Browse files
FrameMuseFrameMuse
authored
Merge pull request #60 from FrameMuse/39-revise-connection-dispatching-between-controller-and-container
Revise connection dispatching between controller and container
2 parents 64d5913 + c5fab69 commit 638024b

16 files changed

+712
-511
lines changed

‎.eslintrc

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
"node": true,
44
"commonjs": true,
55
"browser": true,
6-
"es2021": true
6+
"es2021": true,
7+
"jest": true
78
},
89
"extends": [
910
"eslint:recommended",
10-
"plugin:@typescript-eslint/recommended"
11+
"plugin:react/recommended",
12+
"plugin:@typescript-eslint/recommended",
13+
"plugin:react/jsx-runtime"
14+
// "eslint-config-prettier"
1115
],
1216
"parser": "@typescript-eslint/parser",
1317
"parserOptions": {
@@ -20,13 +24,22 @@
2024
"sourceType": "module"
2125
},
2226
"plugins": [
27+
"react",
2328
"react-hooks",
2429
"@typescript-eslint",
2530
"unused-imports",
2631
"simple-import-sort"
32+
// "eslint-plugin-prettier"
2733
],
2834
"rules": {
29-
"default-case": "warn",
35+
"default-case": "error",
36+
"no-multi-spaces": "error",
37+
"simple-import-sort/imports": "warn",
38+
"unused-imports/no-unused-imports": "warn",
39+
"semi": [
40+
"error",
41+
"never"
42+
],
3043
"indent": [
3144
"error",
3245
2,
@@ -41,18 +54,29 @@
4154
"allowTemplateLiterals": true
4255
}
4356
],
44-
"semi": [
45-
"error",
46-
"never"
57+
"arrow-parens": [
58+
"warn",
59+
"as-needed"
4760
],
48-
"no-multi-spaces": [
49-
"error"
61+
"object-curly-spacing": [
62+
"error",
63+
"always"
5064
],
51-
"react/react-in-jsx-scope": "off",
65+
// OFF
66+
// "prettier/prettier": [
67+
// "error",
68+
// "off"
69+
// ],
70+
"@typescript-eslint/end-of-line": "off",
5271
"@typescript-eslint/explicit-module-boundary-types": "off",
5372
"@typescript-eslint/no-empty-interface": "off",
54-
"@typescript-eslint/ban-types": "off",
55-
"react/no-unescaped-entities": "off",
56-
"simple-import-sort/imports": "error"
57-
}
58-
}
73+
"@typescript-eslint/no-empty-function": "off",
74+
"@typescript-eslint/prefer-namespace-keyword": "off",
75+
"@typescript-eslint/no-namespace": "off"
76+
},
77+
"ignorePatterns": [
78+
"node_modules",
79+
"build",
80+
"coverage"
81+
]
82+
}

‎.vscode/settings.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"editor.codeActionsOnSave": {
3-
"source.organizeImports": false,
43
"source.fixAll.eslint": true
5-
},
6-
"typescript.tsdk": "node_modules/typescript/lib"
7-
}
4+
}
5+
}

‎coverage/clover.xml

Lines changed: 114 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,106 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage generated="1676887153927" clover="3.2.0">
3-
<project timestamp="1676887153927" name="All files">
4-
<metrics statements="107" coveredstatements="102" conditionals="58" coveredconditionals="51" methods="48" coveredmethods="43" elements="213" coveredelements="196" complexity="0" loc="107" ncloc="107" packages="1" files="7" classes="7"/>
2+
<coverage generated="1677037862849" clover="3.2.0">
3+
<project timestamp="1677037862849" name="All files">
4+
<metrics statements="114" coveredstatements="83" conditionals="68" coveredconditionals="36" methods="40" coveredmethods="30" elements="222" coveredelements="149" complexity="0" loc="114" ncloc="114" packages="1" files="8" classes="8"/>
5+
<file name="container.new.tsx" path="/home/kotto/github/react-modal-global/src/container.new.tsx">
6+
<metrics statements="13" coveredstatements="13" conditionals="16" coveredconditionals="15" methods="4" coveredmethods="4"/>
7+
<line num="9" count="2" type="stmt"/>
8+
<line num="15" count="62" type="stmt"/>
9+
<line num="16" count="62" type="stmt"/>
10+
<line num="17" count="28" type="cond" truecount="1" falsecount="1"/>
11+
<line num="18" count="28" type="stmt"/>
12+
<line num="21" count="62" type="cond" truecount="2" falsecount="0"/>
13+
<line num="22" count="62" type="cond" truecount="2" falsecount="0"/>
14+
<line num="24" count="62" type="stmt"/>
15+
<line num="25" count="62" type="cond" truecount="2" falsecount="0"/>
16+
<line num="29" count="62" type="cond" truecount="2" falsecount="0"/>
17+
<line num="34" count="62" type="stmt"/>
18+
<line num="46" count="47" type="stmt"/>
19+
<line num="47" count="2" type="stmt"/>
20+
</file>
521
<file name="container.tsx" path="/home/kotto/github/react-modal-global/src/container.tsx">
6-
<metrics statements="13" coveredstatements="13" conditionals="14" coveredconditionals="14" methods="6" coveredmethods="6"/>
7-
<line num="25" count="3" type="stmt"/>
8-
<line num="52" count="25" type="stmt"/>
9-
<line num="59" count="120" type="cond" truecount="2" falsecount="0"/>
10-
<line num="63" count="25" type="stmt"/>
11-
<line num="67" count="25" type="stmt"/>
12-
<line num="71" count="58" type="stmt"/>
13-
<line num="72" count="58" type="stmt"/>
14-
<line num="73" count="58" type="cond" truecount="2" falsecount="0"/>
15-
<line num="74" count="58" type="cond" truecount="2" falsecount="0"/>
16-
<line num="76" count="58" type="cond" truecount="2" falsecount="0"/>
17-
<line num="80" count="58" type="stmt"/>
18-
<line num="98" count="58" type="stmt"/>
19-
<line num="99" count="2" type="stmt"/>
22+
<metrics statements="10" coveredstatements="0" conditionals="14" coveredconditionals="0" methods="4" coveredmethods="0"/>
23+
<line num="55" count="0" type="stmt"/>
24+
<line num="62" count="0" type="cond" truecount="0" falsecount="2"/>
25+
<line num="74" count="0" type="stmt"/>
26+
<line num="75" count="0" type="stmt"/>
27+
<line num="76" count="0" type="cond" truecount="0" falsecount="2"/>
28+
<line num="77" count="0" type="cond" truecount="0" falsecount="2"/>
29+
<line num="79" count="0" type="cond" truecount="0" falsecount="2"/>
30+
<line num="83" count="0" type="stmt"/>
31+
<line num="101" count="0" type="stmt"/>
32+
<line num="102" count="0" type="stmt"/>
2033
</file>
2134
<file name="context.ts" path="/home/kotto/github/react-modal-global/src/context.ts">
2235
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
23-
<line num="23" count="3" type="stmt"/>
36+
<line num="23" count="2" type="stmt"/>
2437
</file>
2538
<file name="controller.ts" path="/home/kotto/github/react-modal-global/src/controller.ts">
26-
<metrics statements="61" coveredstatements="61" conditionals="22" coveredconditionals="22" methods="32" coveredmethods="27"/>
27-
<line num="25" count="3" type="stmt"/>
28-
<line num="30" count="3" type="stmt"/>
29-
<line num="38" count="76" type="stmt"/>
30-
<line num="39" count="76" type="cond" truecount="2" falsecount="0"/>
31-
<line num="40" count="4" type="stmt"/>
32-
<line num="41" count="4" type="stmt"/>
33-
<line num="44" count="72" type="stmt"/>
34-
<line num="74" count="48" type="stmt"/>
35-
<line num="75" count="48" type="stmt"/>
36-
<line num="76" count="48" type="stmt"/>
37-
<line num="77" count="23" type="stmt"/>
38-
<line num="78" count="23" type="stmt"/>
39-
<line num="81" count="48" type="stmt"/>
40-
<line num="82" count="48" type="stmt"/>
41-
<line num="84" count="48" type="stmt"/>
42-
<line num="86" count="48" type="stmt"/>
43-
<line num="89" count="2" type="stmt"/>
39+
<metrics statements="58" coveredstatements="57" conditionals="16" coveredconditionals="13" methods="22" coveredmethods="21"/>
40+
<line num="24" count="3" type="stmt"/>
41+
<line num="48" count="38" type="stmt"/>
42+
<line num="50" count="68" type="stmt"/>
43+
<line num="56" count="130" type="stmt"/>
44+
<line num="59" count="38" type="stmt"/>
45+
<line num="60" count="38" type="stmt"/>
46+
<line num="84" count="54" type="stmt"/>
47+
<line num="85" count="54" type="stmt"/>
48+
<line num="86" count="54" type="stmt"/>
49+
<line num="87" count="24" type="stmt"/>
50+
<line num="88" count="24" type="stmt"/>
51+
<line num="91" count="54" type="stmt"/>
52+
<line num="92" count="54" type="stmt"/>
53+
<line num="94" count="54" type="stmt"/>
54+
<line num="96" count="54" type="stmt"/>
4455
<line num="99" count="2" type="stmt"/>
45-
<line num="103" count="2" type="stmt"/>
46-
<line num="109" count="48" type="cond" truecount="2" falsecount="0"/>
47-
<line num="110" count="3" type="stmt"/>
48-
<line num="111" count="3" type="stmt"/>
49-
<line num="114" count="45" type="stmt"/>
50-
<line num="116" count="42" type="cond" truecount="4" falsecount="0"/>
51-
<line num="117" count="16" type="stmt"/>
52-
<line num="119" count="16" type="stmt"/>
53-
<line num="120" count="16" type="stmt"/>
54-
<line num="121" count="16" type="cond" truecount="4" falsecount="0"/>
55-
<line num="122" count="2" type="stmt"/>
56-
<line num="130" count="40" type="cond" truecount="4" falsecount="0"/>
57-
<line num="131" count="1" type="stmt"/>
58-
<line num="138" count="39" type="stmt"/>
59-
<line num="149" count="23" type="cond" truecount="2" falsecount="0"/>
60-
<line num="150" count="1" type="stmt"/>
61-
<line num="151" count="1" type="stmt"/>
62-
<line num="152" count="1" type="stmt"/>
63-
<line num="154" count="1" type="stmt"/>
64-
<line num="157" count="22" type="stmt"/>
65-
<line num="158" count="33" type="stmt"/>
66-
<line num="159" count="21" type="stmt"/>
67-
<line num="162" count="21" type="cond" truecount="4" falsecount="0"/>
68-
<line num="163" count="12" type="stmt"/>
69-
<line num="166" count="9" type="stmt"/>
70-
<line num="175" count="3" type="stmt"/>
71-
<line num="176" count="3" type="stmt"/>
72-
<line num="187" count="1" type="stmt"/>
73-
<line num="188" count="4" type="stmt"/>
74-
<line num="189" count="1" type="stmt"/>
75-
<line num="191" count="4" type="stmt"/>
56+
<line num="109" count="2" type="stmt"/>
57+
<line num="110" count="2" type="cond" truecount="1" falsecount="1"/>
58+
<line num="111" count="2" type="stmt"/>
59+
<line num="114" count="2" type="stmt"/>
60+
<line num="125" count="54" type="cond" truecount="4" falsecount="0"/>
61+
<line num="126" count="2" type="stmt"/>
62+
<line num="129" count="54" type="stmt"/>
63+
<line num="130" count="54" type="stmt"/>
64+
<line num="131" count="54" type="stmt"/>
65+
<line num="137" count="24" type="cond" truecount="1" falsecount="1"/>
66+
<line num="139" count="24" type="stmt"/>
67+
<line num="140" count="24" type="cond" truecount="2" falsecount="0"/>
68+
<line num="141" count="13" type="stmt"/>
69+
<line num="145" count="13" type="cond" truecount="2" falsecount="0"/>
70+
<line num="146" count="10" type="stmt"/>
71+
<line num="147" count="10" type="stmt"/>
72+
<line num="151" count="14" type="stmt"/>
73+
<line num="152" count="14" type="stmt"/>
74+
<line num="156" count="2" type="stmt"/>
75+
<line num="157" count="9" type="cond" truecount="2" falsecount="0"/>
76+
<line num="158" count="1" type="stmt"/>
77+
<line num="161" count="8" type="cond" truecount="1" falsecount="1"/>
78+
<line num="162" count="0" type="stmt"/>
79+
<line num="165" count="8" type="stmt"/>
80+
<line num="167" count="2" type="stmt"/>
81+
<line num="171" count="5" type="stmt"/>
82+
<line num="172" count="1" type="stmt"/>
83+
<line num="179" count="8" type="stmt"/>
84+
<line num="185" count="2" type="stmt"/>
85+
<line num="191" count="1" type="stmt"/>
7686
<line num="192" count="1" type="stmt"/>
77-
<line num="194" count="1" type="stmt"/>
78-
<line num="201" count="1" type="stmt"/>
79-
<line num="202" count="5" type="stmt"/>
80-
<line num="203" count="1" type="stmt"/>
81-
<line num="205" count="2" type="stmt"/>
82-
<line num="206" count="1" type="stmt"/>
83-
<line num="208" count="1" type="stmt"/>
84-
<line num="215" count="1" type="stmt"/>
85-
<line num="216" count="4" type="stmt"/>
86-
<line num="217" count="1" type="stmt"/>
87-
<line num="222" count="3" type="stmt"/>
87+
<line num="202" count="28" type="stmt"/>
88+
<line num="203" count="73" type="stmt"/>
89+
<line num="207" count="73" type="stmt"/>
90+
<line num="210" count="28" type="stmt"/>
91+
<line num="211" count="28" type="stmt"/>
92+
<line num="212" count="28" type="stmt"/>
93+
<line num="214" count="28" type="stmt"/>
94+
<line num="215" count="28" type="stmt"/>
95+
<line num="216" count="28" type="stmt"/>
96+
<line num="217" count="28" type="stmt"/>
97+
<line num="223" count="3" type="stmt"/>
8898
</file>
8999
<file name="hooks.ts" path="/home/kotto/github/react-modal-global/src/hooks.ts">
90100
<metrics statements="3" coveredstatements="3" conditionals="2" coveredconditionals="2" methods="1" coveredmethods="1"/>
91-
<line num="34" count="58" type="stmt"/>
92-
<line num="35" count="57" type="cond" truecount="2" falsecount="0"/>
93-
<line num="37" count="53" type="stmt"/>
101+
<line num="34" count="59" type="stmt"/>
102+
<line num="35" count="58" type="cond" truecount="2" falsecount="0"/>
103+
<line num="37" count="54" type="stmt"/>
94104
</file>
95105
<file name="index.ts" path="/home/kotto/github/react-modal-global/src/index.ts">
96106
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
@@ -99,33 +109,33 @@
99109
<metrics statements="0" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
100110
</file>
101111
<file name="utils.ts" path="/home/kotto/github/react-modal-global/src/utils.ts">
102-
<metrics statements="29" coveredstatements="24" conditionals="20" coveredconditionals="13" methods="9" coveredmethods="9"/>
103-
<line num="26" count="62" type="stmt"/>
104-
<line num="27" count="62" type="cond" truecount="2" falsecount="0"/>
105-
<line num="29" count="26" type="stmt"/>
106-
<line num="30" count="26" type="stmt"/>
107-
<line num="32" count="26" type="stmt"/>
108-
<line num="33" count="26" type="stmt"/>
109-
<line num="38" count="32" type="cond" truecount="1" falsecount="1"/>
110-
<line num="41" count="186" type="stmt"/>
111-
<line num="42" count="186" type="stmt"/>
112-
<line num="43" count="186" type="cond" truecount="4" falsecount="0"/>
113-
<line num="44" count="32" type="cond" truecount="1" falsecount="1"/>
112+
<metrics statements="29" coveredstatements="9" conditionals="20" coveredconditionals="6" methods="9" coveredmethods="4"/>
113+
<line num="26" count="66" type="stmt"/>
114+
<line num="27" count="66" type="cond" truecount="2" falsecount="0"/>
115+
<line num="29" count="27" type="stmt"/>
116+
<line num="30" count="27" type="stmt"/>
117+
<line num="32" count="27" type="stmt"/>
118+
<line num="33" count="27" type="stmt"/>
119+
<line num="38" count="0" type="cond" truecount="0" falsecount="2"/>
120+
<line num="41" count="0" type="stmt"/>
121+
<line num="42" count="0" type="stmt"/>
122+
<line num="43" count="0" type="cond" truecount="0" falsecount="4"/>
123+
<line num="44" count="0" type="cond" truecount="0" falsecount="2"/>
114124
<line num="45" count="0" type="stmt"/>
115-
<line num="47" count="32" type="stmt"/>
116-
<line num="50" count="186" type="stmt"/>
117-
<line num="55" count="186" type="cond" truecount="1" falsecount="1"/>
125+
<line num="47" count="0" type="stmt"/>
126+
<line num="50" count="0" type="stmt"/>
127+
<line num="55" count="0" type="cond" truecount="0" falsecount="2"/>
118128
<line num="58" count="0" type="cond" truecount="0" falsecount="2"/>
119129
<line num="59" count="0" type="stmt"/>
120130
<line num="63" count="0" type="stmt"/>
121-
<line num="66" count="186" type="stmt"/>
122-
<line num="70" count="186" type="stmt"/>
123-
<line num="71" count="186" type="stmt"/>
124-
<line num="73" count="186" type="stmt"/>
125-
<line num="74" count="186" type="stmt"/>
126-
<line num="77" count="32" type="stmt"/>
127-
<line num="78" count="32" type="stmt"/>
128-
<line num="87" count="30" type="stmt"/>
131+
<line num="66" count="0" type="stmt"/>
132+
<line num="70" count="0" type="stmt"/>
133+
<line num="71" count="0" type="stmt"/>
134+
<line num="73" count="0" type="stmt"/>
135+
<line num="74" count="0" type="stmt"/>
136+
<line num="77" count="0" type="stmt"/>
137+
<line num="78" count="0" type="stmt"/>
138+
<line num="87" count="31" type="stmt"/>
129139
<line num="88" count="7" type="cond" truecount="3" falsecount="1"/>
130140
<line num="89" count="7" type="cond" truecount="1" falsecount="1"/>
131141
<line num="92" count="0" type="stmt"/>

0 commit comments

Comments
 (0)