Skip to content

Commit 17afeaf

Browse files
michaelmaillotmichaelmaillot
committed
2 parents 5e1fd37 + cf2a4d2 commit 17afeaf

37 files changed

+151
-129
lines changed

‎CHANGELOG.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
"enhancements": [
88
"`DyanmicForm`: Added file handling [#1625](https://github.com/pnp/sp-dev-fx-controls-react/pull/1625)",
99
"`DynamicForm`: Custom Formatting and Validation, ControlsTestWebPart updates [#1672](https://github.com/pnp/sp-dev-fx-controls-react/pull/1672)",
10-
"`PeoplePicker `: Added custom filter to PeoplePicker selection [#1657](https://github.com/pnp/sp-dev-fx-controls-react/issues/1657)"
10+
"`PeoplePicker`: Added custom filter to PeoplePicker selection [#1657](https://github.com/pnp/sp-dev-fx-controls-react/issues/1657)",
11+
"`RichText`: Align RichText heading styles and font sizes with OOB SharePoint text web part [#1706](https://github.com/pnp/sp-dev-fx-controls-react/pull/1706)"
1112
],
1213
"fixes": [
13-
"Build fails due to missing @iconify/react dependency after upgrade to 3.16.0 [#1719](https://github.com/pnp/sp-dev-fx-controls-react/issues/1719)"
14+
"Build fails due to missing @iconify/react dependency after upgrade to 3.16.0 [#1719](https://github.com/pnp/sp-dev-fx-controls-react/issues/1719)",
15+
"`ModernTaxonomyPicker`: not displaying suggestions when typing in values - API not found error [#1688](https://github.com/pnp/sp-dev-fx-controls-react/issues/1688)",
16+
"`DynamicForm`: Disable issue on fieldOverrides field control when onBeforeSubmit return true [#1715](https://github.com/pnp/sp-dev-fx-controls-react/issues/1715)"
1417
]
1518
},
1619
"contributions": [
1720
"[Guido Zambarda](https://github.com/GuidoZam)",
18-
"[Tom G](https://github.com/t0mgerman)"
21+
"[Lars Fernhomberg](https://github.com/lafe)",
22+
"[Mark Bice](https://github.com/mbice)",
23+
"[Tom G](https://github.com/t0mgerman)",
24+
"[wuxiaojun514](https://github.com/wuxiaojun514)"
1925
]
2026
},
2127
{

‎package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"@types/es6-promise": "3.3.0",
9999
"@types/he": "^1.1.2",
100100
"@types/jest": "25.2.3",
101-
"@types/lodash": "4.14.194",
101+
"@types/lodash": "4.14.202",
102102
"@types/quill": "^1.3.10",
103103
"@types/react": "17.0.45",
104104
"@types/react-addons-shallow-compare": "0.14.17",

‎src/controls/dynamicForm/DynamicForm.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ export class DynamicForm extends React.Component<
286286
field.columnInternalName
287287
)
288288
) {
289-
field.disabled = field.disabled || isSaving;
290-
return fieldOverrides[field.columnInternalName](field);
289+
return fieldOverrides[field.columnInternalName]({ ...field,disabled: field.disabled || isSaving} )
291290
}
292291

293292
// Default render

‎src/controls/richText/RichText.module.scss

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,28 @@
6565
.toolbarDropDownOption {
6666

6767
&.toolbarButtonH2 {
68-
font-size: 21px;
69-
font-weight: 100;
68+
font-size: 20px;
69+
font-weight: 600;
7070
}
7171

7272
&.toolbarButtonH3 {
73-
font-size: 14px;
74-
font-weight: 100 !important;
73+
font-size: 18px;
74+
font-weight: 600;
7575
}
7676

7777
&.toolbarButtonH4 {
78-
font-size: 14px;
79-
font-weight: 100 !important;
78+
font-size: 16px;
79+
font-weight: 600;
8080
}
8181

8282
&.toolbarButtonBlockQuote {
83-
font-size: 14px;
83+
font-size: 16px;
8484
font-style: italic;
8585
}
86+
87+
&.toolbarButtonNormal {
88+
font-size: 16px;
89+
}
8690
}
8791

8892
.toolbarSubmenuCaret {
@@ -179,7 +183,7 @@
179183
.ql-snow .ql-toolbar button {
180184
background-color: "[theme:neutralPrimary, default:#{$ms-color-neutralPrimary}]";
181185
color: "[theme:neutralLighterAlt, default:#{$ms-color-neutralLighterAlt}]";
182-
font-size: 14px;
186+
font-size: 16px;
183187
min-width: 34px;
184188
height: 34px;
185189
padding-top: 4px;
@@ -250,21 +254,21 @@
250254
min-height: 68px;
251255
font-family: "Segoe UI Web (West European)", Segoe UI, -apple-system,
252256
BlinkMacSystemFont, Roboto, Helvetica Neue, sans-serif;
253-
font-size: 17px;
257+
font-size: 18px;
254258

255259
h2 {
256-
font-weight: 100 !important;
260+
font-weight: 600 !important;
257261
font-size: 28px;
258262
}
259263

260264
h3 {
261265
font-size: 24px;
262-
font-weight: 100 !important;
266+
font-weight: 600 !important;
263267
}
264268

265269
h4 {
266-
font-size: 21px;
267-
font-weight: 100 !important;
270+
font-size: 20px;
271+
font-weight: 600 !important;
268272
}
269273

270274
blockquote,
@@ -276,14 +280,13 @@
276280
p,
277281
ul {
278282
-webkit-font-smoothing: antialiased;
279-
color: "[theme:black, default:#{$ms-color-black}]";
280283
line-height: 1.3;
281284
// margin: 0 0 16px;
282285
word-wrap: break-word;
283286
}
284287

285288
blockquote {
286-
border-bottom-color: "[theme:neutralTertiaryAlt, default:#{$ms-color-neutralTertiaryAlt}]";
289+
border-bottom-color: "[theme:neutralLighter, default:#{$ms-color-neutralLighter}]";
287290
border-bottom-style: solid;
288291
border-bottom-width: 1px;
289292
border-left-style: none;
@@ -292,14 +295,13 @@
292295
border-right-style: none;
293296
border-right-width: 0;
294297
border-right-color: transparent;
295-
border-top-color: "[theme:neutralTertiaryAlt, default:#{$ms-color-neutralTertiaryAlt}]";
298+
border-top-color: "[theme:neutralLighter, default:#{$ms-color-neutralLighter}]";
296299
border-top-style: solid;
297300
border-top-width: 1px;
298-
color: "[theme:neutralSecondaryAlt, default:#{$ms-color-neutralSecondaryAlt}]";
299-
font-size: 24px;
301+
font-size: 20px;
300302
font-style: italic;
301-
font-weight: 100;
302-
line-height: 31.2px;
303+
font-weight: 600;
304+
line-height: 1.3;
303305
margin-bottom: 28px;
304306
padding-bottom: 32px;
305307
margin-top: 28px;
@@ -311,6 +313,10 @@
311313
text-align: center;
312314
}
313315

316+
.ql-size-xsmall {
317+
font-size: 10px;
318+
}
319+
314320
.ql-size-small {
315321
font-size: 12px;
316322
}
@@ -320,15 +326,15 @@
320326
}
321327

322328
.ql-size-mediumplus {
323-
font-size: 15px;
329+
font-size: 16px;
324330
}
325331

326332
.ql-size-large {
327-
font-size: 17px;
333+
font-size: 18px;
328334
}
329335

330336
.ql-size-xlarge {
331-
font-size: 21px;
337+
font-size: 20px;
332338
}
333339

334340
.ql-size-xlargeplus {
@@ -350,15 +356,19 @@
350356
.ql-size-super {
351357
font-size: 42px;
352358
}
359+
360+
.ql-size-superlarge {
361+
font-size: 68px;
362+
}
353363
}
354364

355365
@media screen and (min-width: 1024px) {
356366
.ql-editor div,
357367
.ql-editor ol,
358368
.ql-editor p,
359369
.ql-editor ul {
360-
font-size: 17px;
361-
font-weight: 300;
370+
font-size: 18px;
371+
font-weight: 400;
362372
line-height: 1.3;
363373
}
364374
}
@@ -375,8 +385,8 @@
375385
.ql-editor.ql-blank::before {
376386
font-style: normal;
377387
color: "[theme:neutralTertiary, default:#{$ms-color-neutralTertiary}]";
378-
font-size: 17px;
379-
font-weight: 300;
388+
font-size: 18px;
389+
font-weight: 400;
380390
line-height: 1.3;
381391
}
382392

‎src/controls/richText/RichText.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
4141
private _richTextId = undefined;
4242

4343
private ddStyleOpts = [{
44-
key: 0,
45-
text: strings.HeaderNormalText,
46-
data: {}
47-
}, {
4844
key: 2,
4945
text: strings.HeaderH2,
5046
data:
@@ -59,6 +55,10 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
5955
text: strings.HeaderH4,
6056
data:
6157
{ className: styles.toolbarButtonH4 }
58+
}, {
59+
key: 0,
60+
text: strings.HeaderNormalText,
61+
data: { className: styles.toolbarButtonNormal }
6262
}, {
6363
key: 7,
6464
text: strings.HeaderBlockQuote,
@@ -511,7 +511,8 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
511511
'xxlarge',
512512
'xxxlarge',
513513
'xxlargeplus',
514-
'super'];
514+
'super',
515+
'superlarge'];
515516
ReactQuillInstance.register(sizeClass, true);
516517

517518
return (

‎src/controls/richText/RichText.types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export interface StyleOptions {
105105
showImage?: boolean;
106106

107107
/**
108-
* Indicates if we should show the Styles button (Heading 1, Heading 2, ..., Pull quote)
108+
* Indicates if we should show the Styles button (Heading 2, Heading 3, ..., Pull quote)
109109
* @defaultvalue true
110110
*/
111111
showStyles?: boolean;

‎src/controls/richText/RichTextPropertyPane.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,18 @@ export default class RichTextPropertyPane extends React.Component<IRichTextPrope
190190
ariaLabel={strings.FontSizeTitle}
191191
selectedKey={selectedSize}
192192
options={[
193+
{ key: 'xsmall', text: '10' },
193194
{ key: 'small', text: '12' },
194195
{ key: 'medium', text: '14' },
195-
{ key: 'mediumplus', text: '15' },
196-
{ key: 'large', text: '17' },
197-
{ key: 'xlarge', text: '21' },
196+
{ key: 'mediumplus', text: '16' },
197+
{ key: 'large', text: '18' },
198+
{ key: 'xlarge', text: '20' },
198199
{ key: 'xlargeplus', text: '24' },
199200
{ key: 'xxlarge', text: '28' },
200201
{ key: 'xxxlarge', text: '32' },
201202
{ key: 'xxlargeplus', text: '36' },
202203
{ key: 'super', text: '42' },
204+
{ key: 'superlarge', text: '68' }
203205
]}
204206
onChanged={this.onChangeSize}
205207
/>

‎src/loc/bg-bg.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ define([], () => {
7979
"mapsTitlePrefix": "Карта на",
8080
"ListViewFilterLabel": "Филтриране на списъка",
8181
"HeaderNormalText": "Нормален текст",
82-
"HeaderH2": "Функция 1",
83-
"HeaderH3": "Функция 2",
84-
"HeaderH4": "Функция 3",
82+
"HeaderH2": "Функция 2",
83+
"HeaderH3": "Функция 3",
84+
"HeaderH4": "Функция 4",
8585
"HeaderBlockQuote": "Изтегли цитат",
8686
"AlignLeft": "Подравни отляво",
8787
"AlignCenter": "Център",

‎src/loc/ca-es.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ define([], () => {
7979
"mapsTitlePrefix": "Mapa de",
8080
"ListViewFilterLabel": "Filtrar la llista",
8181
"HeaderNormalText": "Text normal",
82-
"HeaderH2": "Encapçalament 1",
83-
"HeaderH3": "Encapçalament 2",
84-
"HeaderH4": "Encapçalament 3",
82+
"HeaderH2": "Encapçalament 2",
83+
"HeaderH3": "Encapçalament 3",
84+
"HeaderH4": "Encapçalament 4",
8585
"HeaderBlockQuote": "Cita introductòria",
8686
"AlignLeft": "Alinea a l'esquerra",
8787
"AlignCenter": "Centre",

0 commit comments

Comments
 (0)