Skip to content
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

Text annotation APIs #6572

Merged
merged 148 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from 115 commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
c85bf6e
TextStyle
pmconne Mar 29, 2024
28153fd
Immutable TextStyle. Not sure this works with 'preserve overrides' op…
pmconne Mar 29, 2024
1baa285
TextBlock
pmconne Mar 29, 2024
9609cae
export
pmconne Mar 29, 2024
8ab2cdc
appendRun/Paragraph; keep styleOverrides unique object
pmconne Mar 29, 2024
318db77
BaselineShift
pmconne Mar 29, 2024
ed2a154
wip docs
pmconne Mar 29, 2024
e59b22f
wip docs
pmconne Mar 30, 2024
deab196
createEffectiveStyle -> createEffectiveSettings
pmconne Mar 30, 2024
22fcb6b
wip docs
pmconne Mar 30, 2024
129bde9
finish docs modulo questions
pmconne Mar 30, 2024
52b55c8
add redundant '@preview' tags
pmconne Mar 30, 2024
42db0e8
TODO
pmconne Mar 30, 2024
8d9a7a4
doc settings
pmconne Mar 31, 2024
f5b94a5
api
pmconne Mar 31, 2024
5611018
missing from prev commit
pmconne Mar 31, 2024
e6aef99
equals(), stub tests
pmconne Apr 1, 2024
437dd2c
TextBlockComponent.equals
pmconne Apr 1, 2024
628319f
test stringify
pmconne Apr 2, 2024
d3cac13
TextBlockLayoutResult
pmconne Apr 2, 2024
26a9fbe
WIP TextBlockLayout (backend)
pmconne Apr 2, 2024
72a67ef
layout....
pmconne Apr 2, 2024
0495f5e
layout?
pmconne Apr 2, 2024
c88179c
toResult
pmconne Apr 2, 2024
869a720
wip produce text block geometry
pmconne Apr 2, 2024
ffaa100
Output text block geometry
pmconne Apr 2, 2024
d7051ca
TextAnnotation
pmconne Apr 3, 2024
d934f84
TextAnnotation2d/3dProps
pmconne Apr 3, 2024
8629cb8
element get/set annotation
pmconne Apr 3, 2024
f910049
doc
pmconne Apr 5, 2024
5b51623
apply styles correctly
pmconne Apr 9, 2024
8b70d0b
temp uncomment
pmconne Apr 9, 2024
154e8c7
TextBlockGeometryProps
pmconne Apr 9, 2024
99114eb
rm TextBlockLayoutResult
pmconne Apr 9, 2024
95d1a9a
rm context from TextBlockLayout
pmconne Apr 9, 2024
347573b
produceTextBlockGeometry
pmconne Apr 9, 2024
ef0d08f
rm obsolete file
pmconne Apr 9, 2024
b50aa8d
document transform
pmconne Apr 9, 2024
4ef8fa1
rename Block > Annotation
pmconne Apr 9, 2024
9edc26a
Revert "rename Block > Annotation"
pmconne Apr 9, 2024
78f1ae0
separate file'
pmconne Apr 9, 2024
dec4f3b
Block > Layout
pmconne Apr 9, 2024
c715a0e
produceTextAnnotationGeometry
pmconne Apr 9, 2024
ded8062
GeometryStreamBuilder.appendTextBlock
pmconne Apr 9, 2024
f6e451f
update element annotation
pmconne Apr 9, 2024
df3639f
Subcategory option
pmconne Apr 9, 2024
43693fb
common docs
pmconne Apr 9, 2024
0ccabb6
docs
pmconne Apr 10, 2024
0dbb97b
common api
pmconne Apr 10, 2024
40f76b1
common lint
pmconne Apr 10, 2024
b66961c
backend api
pmconne Apr 10, 2024
17fb353
lint
pmconne Apr 10, 2024
d5a0d1d
tests
pmconne Apr 10, 2024
86d13f0
test
pmconne Apr 10, 2024
927b3e9
wip hookup defaults
pmconne Apr 10, 2024
e101891
WIP hook up IModelDb.computeRangesForText. Need to update native side
pmconne Apr 10, 2024
c9b81f2
hookup
pmconne Apr 10, 2024
3329b50
Merge branch 'master' into pmc/textblock
pmconne Apr 10, 2024
f3fd5fe
mv file
pmconne Apr 10, 2024
08b6cdf
TextStyleSettings tests
pmconne Apr 10, 2024
f066ae7
wip layout tests.
pmconne Apr 10, 2024
7ec5157
fix applyBlockSettings
pmconne Apr 10, 2024
ca84d91
tests
pmconne Apr 10, 2024
2a0f2d9
test
pmconne Apr 10, 2024
17d5669
failing test
pmconne Apr 10, 2024
6634127
fix expected block ranges
pmconne Apr 10, 2024
961170e
test ranges
pmconne Apr 10, 2024
42bf306
test line breaks
pmconne Apr 10, 2024
5f70b6e
stub
pmconne Apr 10, 2024
4404b58
test run wrapping (failed)
pmconne Apr 10, 2024
3141f40
update line range every time a run is appended.
pmconne Apr 10, 2024
699cc36
off by one on document width
pmconne Apr 10, 2024
346df8c
RunLayout.clone
pmconne Apr 11, 2024
7e10ead
stub
pmconne Apr 11, 2024
8810ed2
update backend compiler target to ES2022 for Intl.Segmenter
pmconne Apr 11, 2024
458074c
wrap?
pmconne Apr 11, 2024
5497c03
clarity
pmconne Apr 11, 2024
d91af17
wrap
pmconne Apr 11, 2024
7487f7b
word wrap test infinite loop
pmconne Apr 11, 2024
a2bf773
break infinite loop
pmconne Apr 11, 2024
f024f08
ugh
pmconne Apr 11, 2024
e4e51b8
get wrap test passing
pmconne Apr 11, 2024
04a2860
get other test passing again
pmconne Apr 11, 2024
12b9492
oh goody, different behavior than chrome
pmconne Apr 11, 2024
464a57a
electron wins
pmconne Apr 11, 2024
4cb8ea3
punctuation
pmconne Apr 11, 2024
cb2ecaa
moar test
pmconne Apr 11, 2024
52fc704
consecutive whitespace
pmconne Apr 11, 2024
9c52de3
non-english wrap
pmconne Apr 11, 2024
adf94ad
test
pmconne Apr 11, 2024
f3ec7b6
test lineHeight and lineSpacingFactor
pmconne Apr 11, 2024
b3eac9a
wip element tests
pmconne Apr 11, 2024
036b1b0
setAnnotation test
pmconne Apr 11, 2024
2c531c2
subcategory test
pmconne Apr 11, 2024
b783aed
rm TODO
pmconne Apr 11, 2024
e2c05d3
geometry tests'
pmconne Apr 11, 2024
1991444
.only, rm TODOs
pmconne Apr 12, 2024
a598dcf
doc groups cleanup
pmconne Apr 12, 2024
6c0a5c0
sort doc groups; ViewStateHydrator is supposed to be internal
pmconne Apr 12, 2024
eb5d026
address TODOs
pmconne Apr 12, 2024
018b426
extract-api
pmconne Apr 12, 2024
50c47c4
lint-fix
pmconne Apr 12, 2024
9f9f278
changelog
pmconne Apr 12, 2024
5ff9c63
Merge branch 'master' into pmc/textblock
pmconne Apr 12, 2024
7a6650f
add missing docs
pmconne Apr 12, 2024
739bddf
Merge branch 'pmc/textblock' of https://github.com/iTwin/itwinjs-core…
pmconne Apr 12, 2024
9b6fd42
register TextAnnotation elements
pmconne Apr 12, 2024
28e6464
you've gotta be kidding me.
pmconne Apr 12, 2024
00ec4bb
flatbuffer
pmconne Apr 12, 2024
fd7a382
wip round-trip tests
pmconne Apr 12, 2024
8648627
test, equals
pmconne Apr 12, 2024
ef405c8
Test, host not started?
pmconne Apr 12, 2024
fa611e6
.
pmconne Apr 12, 2024
4f83f69
dammit
pmconne Apr 12, 2024
4321a02
json -> range
pmconne Apr 12, 2024
883ae27
test placement
pmconne Apr 13, 2024
7d5403f
trying to test persistent fonts
pmconne Apr 13, 2024
2a8687a
embed freely distributable Vera font
pmconne Apr 13, 2024
696ee79
...
pmconne Apr 13, 2024
cfa31d9
gonna need a second font...
pmconne Apr 13, 2024
4825035
add second font
pmconne Apr 13, 2024
a3c09de
dta rpc method to get text annotation geometry
pmconne Apr 15, 2024
c165631
WIP TextDecorationTool. Fix TextString JSON in geometry stream.
pmconne Apr 15, 2024
8480418
Require category arg
pmconne Apr 15, 2024
6692f7f
line draws.
pmconne Apr 15, 2024
21183a0
native no like font Id zero
pmconne Apr 16, 2024
f9d30f1
place at view center; clear option
pmconne Apr 16, 2024
868a534
WIP the laziest text editor possible
pmconne Apr 16, 2024
3dabd79
more cmds
pmconne Apr 16, 2024
701e7bf
it's almost as efficient as ed
pmconne Apr 16, 2024
02dc6d2
README
pmconne Apr 16, 2024
6d1bafe
rm unused code
pmconne Apr 16, 2024
8c5a230
fix fraction translation
pmconne Apr 16, 2024
5952c72
fix fraction width
pmconne Apr 16, 2024
2da106f
lint
pmconne Apr 16, 2024
e5bf03a
TextAnnotation.create
pmconne Apr 16, 2024
d48edc2
extract-api
pmconne Apr 16, 2024
bfddb38
lint
pmconne Apr 16, 2024
8b67a09
Merge branch 'master' into pmc/textblock
pmconne Apr 16, 2024
b1f4cfd
NextVersion
pmconne Apr 16, 2024
615dccf
Merge branch 'master' into pmc/textblock
pmconne Apr 17, 2024
30ac988
@bentley/imodeljs-native 4.6.13
imodeljs-admin Apr 17, 2024
105ba62
add missing doc group description
pmconne Apr 17, 2024
6a24acb
extension api
pmconne Apr 17, 2024
1cb37d6
extension api is annoying
pmconne Apr 17, 2024
bfaa463
Merge branch 'master' into pmc/textblock
pmconne Apr 17, 2024
8a5f721
maybe i successfully reverse-engineered unhelpful docs error messages?
pmconne Apr 17, 2024
ddd21e3
Merge branch 'pmc/textblock' of https://github.com/iTwin/itwinjs-core…
pmconne Apr 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions common/api/core-backend.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { AuxCoordSystem3dProps } from '@itwin/core-common';
import { AuxCoordSystemProps } from '@itwin/core-common';
import { AxisAlignedBox3d } from '@itwin/core-common';
import { Base64EncodedString } from '@itwin/core-common';
import { BaselineShift } from '@itwin/core-common';
import { BeDuration } from '@itwin/core-bentley';
import { BeEvent } from '@itwin/core-bentley';
import { BentleyError } from '@itwin/core-bentley';
Expand Down Expand Up @@ -212,6 +213,9 @@ import { SubCategoryProps } from '@itwin/core-common';
import { SubCategoryResultRow } from '@itwin/core-common';
import { SubjectProps } from '@itwin/core-common';
import { SynchronizationConfigLinkProps } from '@itwin/core-common';
import { TextAnnotation } from '@itwin/core-common';
import { TextAnnotation2dProps } from '@itwin/core-common';
import { TextAnnotation3dProps } from '@itwin/core-common';
import { TextureData } from '@itwin/core-common';
import { TextureLoadProps } from '@itwin/core-common';
import { TextureMapProps } from '@itwin/core-common';
Expand Down Expand Up @@ -3051,6 +3055,8 @@ export abstract class IModelDb extends IModel {
get codeValueBehavior(): "exact" | "trim-unicode-whitespace";
set codeValueBehavior(newBehavior: "exact" | "trim-unicode-whitespace");
computeProjectExtents(options?: ComputeProjectExtentsOptions): ComputedProjectExtents;
// @internal (undocumented)
computeRangesForText(args: ComputeRangesForTextLayoutArgs): TextLayoutRanges;
constructEntity<T extends Entity, P extends EntityProps = EntityProps>(props: P): T;
containsClass(classFullName: string): boolean;
// @alpha
Expand Down Expand Up @@ -5414,16 +5420,28 @@ export class TemplateViewDefinition3d extends ViewDefinition3d {

// @public
export class TextAnnotation2d extends AnnotationElement2d {
protected constructor(props: GeometricElement2dProps, iModel: IModelDb);
protected constructor(props: TextAnnotation2dProps, iModel: IModelDb);
// @internal (undocumented)
static get className(): string;
// (undocumented)
static fromJSON(props: TextAnnotation2dProps, iModel: IModelDb): TextAnnotation2d;
getAnnotation(): TextAnnotation | undefined;
setAnnotation(annotation: TextAnnotation, subCategory?: Id64String): boolean;
// (undocumented)
toJSON(): TextAnnotation2dProps;
}

// @public
export class TextAnnotation3d extends GraphicalElement3d {
protected constructor(props: GeometricElement3dProps, iModel: IModelDb);
protected constructor(props: TextAnnotation3dProps, iModel: IModelDb);
// @internal (undocumented)
static get className(): string;
// (undocumented)
static fromJSON(props: TextAnnotation3dProps, iModel: IModelDb): TextAnnotation3d;
getAnnotation(): TextAnnotation | undefined;
setAnnotation(annotation: TextAnnotation, subCategory?: Id64String): boolean;
// (undocumented)
toJSON(): TextAnnotation3dProps;
}

// @public
Expand Down
Loading
Loading