-
Notifications
You must be signed in to change notification settings - Fork 8.6k
[Lens] Enable monospace numeric font features for Lens renderers #251576
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.
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
awahab07
merged 21 commits into
elastic:main
from
awahab07:249382_Lens_Activate-monospaced-font-in-charts
Apr 2, 2026
Merged
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
e713bd6
Numeric font features for Lens.
awahab07 f9b5301
Merge branch 'main' into 249382_Lens_Activate-monospaced-font-in-charts
elasticmachine 154ed1c
Merge with `main`.
awahab07 24053e2
Override elastic-chart's own `font-feature-settings`.
awahab07 2ed6eff
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 51d7331
Introduction of "Elastic UI Numeric" font and licensing.
awahab07 9e46155
WIP - Testing "Elastic UI Numeric" fonts in Lens.
awahab07 06b2e09
Merge branch 'main' into 249382_Lens_Activate-monospaced-font-in-charts
awahab07 5c049fa
- Improve typing for font face
awahab07 5f94f06
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 d71e15e
Add missing helper file.
awahab07 50918d1
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 4814685
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 672bb46
Make Tagcloud chart tests adaptive.
awahab07 fb91e4a
Merge branch 'main' into 249382_Lens_Activate-monospaced-font-in-charts
awahab07 0184d01
Apply monospace styles to Lens rendered Region Map.
awahab07 d2128db
Make tagcloud tests resilient and adaptive, preserving semantic asser…
awahab07 da98f1b
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 89de900
Merge remote-tracking branch 'origin/main' into 249382_Lens_Activate-…
awahab07 ab26692
Improve font-face rules construction.
awahab07 e0c6ade
Merge branch 'main' into 249382_Lens_Activate-monospaced-font-in-charts
awahab07 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file added
BIN
+7.73 KB
...ages/apps/server-internal/assets/fonts/elastic_ui_numeric/ElasticUINumeric-Variable.woff2
Binary file not shown.
104 changes: 104 additions & 0 deletions
104
src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/LICENSE.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| Elastic UI Numeric | ||
| ================== | ||
|
|
||
| This font is a modified version of Inter, created by Elastic for use in Kibana charts. | ||
| It contains a subset of numeric glyphs and common punctuation with OpenType features | ||
| (tnum, zero, ss01, ss07) baked into the default character mapping. | ||
|
|
||
| Upstream: Inter (https://github.com/rsms/inter) | ||
| Copyright: Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) | ||
| "Inter" is trademark of Rasmus Andersson. | ||
|
|
||
| This Font Software is licensed under the SIL Open Font License, Version 1.1. | ||
| This license is copied below, and is also available with a FAQ at: | ||
| http://scripts.sil.org/OFL | ||
|
|
||
| This modified font is distributed under the SIL Open Font License, Version 1.1, | ||
| the same license as the upstream Inter font. | ||
|
|
||
| ----------------------------------------------------------- | ||
| SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 | ||
| ----------------------------------------------------------- | ||
|
|
||
| PREAMBLE | ||
| The goals of the Open Font License (OFL) are to stimulate worldwide | ||
| development of collaborative font projects, to support the font creation | ||
| efforts of academic and linguistic communities, and to provide a free and | ||
| open framework in which fonts may be shared and improved in partnership | ||
| with others. | ||
|
|
||
| The OFL allows the licensed fonts to be used, studied, modified and | ||
| redistributed freely as long as they are not sold by themselves. The | ||
| fonts, including any derivative works, can be bundled, embedded, | ||
| redistributed and/or sold with any software provided that any reserved | ||
| names are not used by derivative works. The fonts and derivatives, | ||
| however, cannot be released under any other type of license. The | ||
| requirement for fonts to remain under this license does not apply | ||
| to any document created using the fonts or their derivatives. | ||
|
|
||
| DEFINITIONS | ||
| "Font Software" refers to the set of files released by the Copyright | ||
| Holder(s) under this license and clearly marked as such. This may | ||
| include source files, build scripts and documentation. | ||
|
|
||
| "Reserved Font Name" refers to any names specified as such after the | ||
| copyright statement(s). | ||
|
|
||
| "Original Version" refers to the collection of Font Software components as | ||
| distributed by the Copyright Holder(s). | ||
|
|
||
| "Modified Version" refers to any derivative made by adding to, deleting, | ||
| or substituting -- in part or in whole -- any of the components of the | ||
| Original Version, by changing formats or by porting the Font Software to a | ||
| new environment. | ||
|
|
||
| "Author" refers to any designer, engineer, programmer, technical | ||
| writer or other person who contributed to the Font Software. | ||
|
|
||
| PERMISSION AND CONDITIONS | ||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of the Font Software, to use, study, copy, merge, embed, modify, | ||
| redistribute, and sell modified and unmodified copies of the Font | ||
| Software, subject to the following conditions: | ||
|
|
||
| 1) Neither the Font Software nor any of its individual components, | ||
| in Original or Modified Versions, may be sold by itself. | ||
|
|
||
| 2) Original or Modified Versions of the Font Software may be bundled, | ||
| redistributed and/or sold with any software, provided that each copy | ||
| contains the above copyright notice and this license. These can be | ||
| included either as stand-alone text files, human-readable headers or | ||
| in the appropriate machine-readable metadata fields within text or | ||
| binary files as long as those fields can be easily viewed by the user. | ||
|
|
||
| 3) No Modified Version of the Font Software may use the Reserved Font | ||
| Name(s) unless explicit written permission is granted by the corresponding | ||
| Copyright Holder. This restriction only applies to the primary font name as | ||
| presented to the users. | ||
|
|
||
| 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font | ||
| Software shall not be used to promote, endorse or advertise any | ||
| Modified Version, except to acknowledge the contribution(s) of the | ||
| Copyright Holder(s) and the Author(s) or with their explicit written | ||
| permission. | ||
|
|
||
| 5) The Font Software, modified or unmodified, in part or in whole, | ||
| must be distributed entirely under this license, and must not be | ||
| distributed under any other license. The requirement for fonts to | ||
| remain under this license does not apply to any document created | ||
| using the Font Software. | ||
|
|
||
| TERMINATION | ||
| This license becomes null and void if any of the above conditions are | ||
| not met. | ||
|
|
||
| DISCLAIMER | ||
| THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT | ||
| OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE | ||
| COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL | ||
| DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM | ||
| OTHER DEALINGS IN THE FONT SOFTWARE. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
src/platform/plugins/shared/charts/public/services/theme/helpers.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| import { applyNumericFontFamily, ELASTIC_UI_NUMERIC_FONT_FAMILY } from './helpers'; | ||
|
|
||
| describe('applyNumericFontFamily', () => { | ||
| it('prepends the numeric font family to any fontFamily string', () => { | ||
| const theme = { | ||
| axes: { | ||
| tickLabel: { | ||
| fontFamily: 'Inter, sans-serif', | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| applyNumericFontFamily(theme); | ||
|
|
||
| expect(theme.axes.tickLabel.fontFamily).toBe( | ||
| `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter, sans-serif` | ||
| ); | ||
| }); | ||
|
|
||
| it('does not double-prepend when already present', () => { | ||
| const theme = { | ||
| fontFamily: `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter, sans-serif`, | ||
| }; | ||
|
|
||
| applyNumericFontFamily(theme); | ||
|
|
||
| expect(theme.fontFamily).toBe(`${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter, sans-serif`); | ||
| }); | ||
|
|
||
| it('walks arrays and ignores non-record entries', () => { | ||
| const theme = { | ||
| series: [ | ||
| { label: { fontFamily: 'Inter' } }, | ||
| 'skip-me', | ||
| null, | ||
| { label: { fontFamily: `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter` } }, | ||
| ], | ||
| }; | ||
|
|
||
| applyNumericFontFamily(theme); | ||
|
|
||
| expect(theme.series[0]).toEqual({ | ||
| label: { fontFamily: `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter` }, | ||
| }); | ||
| expect(theme.series[3]).toEqual({ | ||
| label: { fontFamily: `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, Inter` }, | ||
| }); | ||
| }); | ||
| }); |
34 changes: 34 additions & 0 deletions
34
src/platform/plugins/shared/charts/public/services/theme/helpers.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| import { isPlainObject } from 'lodash'; | ||
|
|
||
| export const ELASTIC_UI_NUMERIC_FONT_FAMILY = "'Elastic UI Numeric'"; | ||
|
|
||
| const isRecord = (value: unknown): value is Record<string, unknown> => isPlainObject(value); | ||
|
|
||
| export const applyNumericFontFamily = (value: unknown): void => { | ||
| if (Array.isArray(value)) { | ||
| value.forEach(applyNumericFontFamily); | ||
| return; | ||
| } | ||
|
|
||
| if (!isRecord(value)) return; | ||
|
|
||
| for (const [key, entry] of Object.entries(value)) { | ||
| if (key === 'fontFamily' && typeof entry === 'string') { | ||
| value[key] = entry.includes(ELASTIC_UI_NUMERIC_FONT_FAMILY) | ||
| ? entry | ||
| : `${ELASTIC_UI_NUMERIC_FONT_FAMILY}, ${entry}`; | ||
| continue; | ||
| } | ||
|
|
||
| applyNumericFontFamily(entry); | ||
| } | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a little surprised there's no test case for this yet... would you mind adding one? Thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for pointing this out @jloleysens, I've opened a PR #262103.