npm - @univerjs/sheets-ui - Versions diffs - 0.1.17 → 0.2.0 - Mend

@univerjs/sheets-ui 0.1.17 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (45) hide show

package/lib/types/services/clipboard/__tests__/constant.d.ts CHANGED Viewed

@@ -21,7 +21,8 @@ export declare const fontSampleByUniver = "<html><head></head><body><google data
 export declare const borderSampleByExcel = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\"\r\nxmlns:o=\"urn:schemas-microsoft-com:office:office\"\r\nxmlns:x=\"urn:schemas-microsoft-com:office:excel\"\r\nxmlns=\"http://www.w3.org/TR/REC-html40\">\r\n\r\n<head>\r\n<meta http-equiv=Content-Type content=\"text/html; charset=utf-8\">\r\n<meta name=ProgId content=Excel.Sheet>\r\n<meta name=Generator content=\"Microsoft Excel 15\">\r\n<link id=Main-File rel=Main-File\r\nhref=\"file:////Users/yuanbin/Library/Group%20Containers/UBF8T346G9.Office/TemporaryItems/msohtmlclip/clip.htm\">\r\n<link rel=File-List\r\nhref=\"file:////Users/yuanbin/Library/Group%20Containers/UBF8T346G9.Office/TemporaryItems/msohtmlclip/clip_filelist.xml\">\r\n<style>\r\n<!--table\r\n\t{mso-displayed-decimal-separator:\"\\.\";\r\n\tmso-displayed-thousand-separator:\"\\,\";}\r\n@page\r\n\t{margin:.75in .7in .75in .7in;\r\n\tmso-header-margin:.3in;\r\n\tmso-footer-margin:.3in;}\r\ntr\r\n\t{mso-height-source:auto;\r\n\tmso-ruby-visibility:none;}\r\ncol\r\n\t{mso-width-source:auto;\r\n\tmso-ruby-visibility:none;}\r\nbr\r\n\t{mso-data-placement:same-cell;}\r\ntd\r\n\t{padding-top:1px;\r\n\tpadding-right:1px;\r\n\tpadding-left:1px;\r\n\tmso-ignore:padding;\r\n\tcolor:black;\r\n\tfont-size:12.0pt;\r\n\tfont-weight:400;\r\n\tfont-style:normal;\r\n\ttext-decoration:none;\r\n\tfont-family:\u7B49\u7EBF;\r\n\tmso-generic-font-family:auto;\r\n\tmso-font-charset:134;\r\n\tmso-number-format:General;\r\n\ttext-align:general;\r\n\tvertical-align:middle;\r\n\tborder:none;\r\n\tmso-background-source:auto;\r\n\tmso-pattern:auto;\r\n\tmso-protection:locked visible;\r\n\twhite-space:nowrap;\r\n\tmso-rotate:0;}\r\n.xl65\r\n\t{border:.5pt solid black;}\r\n.xl66\r\n\t{text-align:center;\r\n\tborder:.5pt solid black;}\r\nruby\r\n\t{ruby-align:left;}\r\nrt\r\n\t{color:windowtext;\r\n\tfont-size:9.0pt;\r\n\tfont-weight:400;\r\n\tfont-style:normal;\r\n\ttext-decoration:none;\r\n\tfont-family:\u7B49\u7EBF;\r\n\tmso-generic-font-family:auto;\r\n\tmso-font-charset:134;\r\n\tmso-char-type:none;\r\n\tdisplay:none;}\r\n-->\r\n</style>\r\n</head>\r\n\r\n<body link=\"#0563C1\" vlink=\"#954F72\">\r\n\r\n<table border=0 cellpadding=0 cellspacing=0 width=348 style='border-collapse:\r\n collapse;width:260pt'>\r\n<!--StartFragment-->\r\n <col width=87 span=4 style='width:65pt'>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 width=87 style='height:16.0pt;width:65pt'></td>\r\n  <td width=87 style='width:65pt'></td>\r\n  <td width=87 style='width:65pt'></td>\r\n  <td width=87 style='width:65pt'></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td class=xl65>\u3000</td>\r\n  <td class=xl65 style='border-left:none'>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td class=xl65 style='border-top:none'>\u3000</td>\r\n  <td class=xl65 style='border-top:none;border-left:none'>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td class=xl65 style='border-top:none'>\u3000</td>\r\n  <td class=xl65 style='border-top:none;border-left:none'>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td class=xl65 style='border-top:none'>\u3000</td>\r\n  <td class=xl65 style='border-top:none;border-left:none'>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td class=xl65 style='border-top:none'>\u3000</td>\r\n  <td class=xl65 style='border-top:none;border-left:none'>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n  <td></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n  <td></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td colspan=2 rowspan=5 class=xl66>\u3000</td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n </tr>\r\n <tr height=21 style='height:16.0pt'>\r\n  <td height=21 style='height:16.0pt'></td>\r\n  <td></td>\r\n  <td></td>\r\n  <td></td>\r\n </tr>\r\n<!--EndFragment-->\r\n</table>\r\n\r\n</body>\r\n\r\n</html>\r\n";
 export declare const borderSampleByGoogle = "<google-sheets-html-origin><style type=\"text/css\"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" border=\"1\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\" data-sheets-root=\"1\"><colgroup><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/></colgroup><tbody><tr style=\"height:21px;\"><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"border-right:1px solid #000000;border-bottom:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\" rowspan=\"5\" colspan=\"2\"><span><div style=\"max-height:105px\"></div></span></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"border-right:1px solid #000000;overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr><tr style=\"height:21px;\"><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;\"></td></tr></tbody></table>";
 export declare const borderSampleByUniver = "<html><head></head><body><google data-copy-id=\"PgwMK9\" -sheets-html-origin=\"\"><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\"><colgroup><col width=\"73\"><col width=\"73\"><col width=\"73\"><col width=\"73\"></colgroup>\n<tbody><tr style=\"height: 19px;\"><td></td><td></td><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td style=\"border-bottom: 0.5pt solid #000000; border-top: 0.5pt solid #000000; border-right: 0.5pt solid #000000; border-left: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td rowspan=\"5\" colspan=\"2\" style=\"border-top: 0.5pt solid #000000; border-left: 0.5pt solid #000000; ;border-bottom: 0.5pt solid #000000; border-right: 0.5pt solid #000000; \"></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td></tr><tr style=\"height: 19px;\"><td></td><td></td><td></td><td></td></tr></tbody></table></google></body></html>";
-export declare const rotateSampleByUniver = "<html><head></head><body><google data-copy-id=\"1rz7ZZ\" -sheets-html-origin=\"\"><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\"><colgroup><col width=\"73\"></colgroup>\n<tbody><tr style=\"height: 19px;\"><td>univer</td></tr><tr style=\"height: 46.67004020088826px;\"><td style=\"data-rotate: (-45deg);\">univer</td></tr><tr style=\"height: 46.67004020088826px;\"><td style=\"data-rotate: (45deg);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"data-rotate: (0deg ,1);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"data-rotate: (-90deg);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"data-rotate: (90deg);\">univer</td></tr></tbody></table></google></body></html>";
+export declare const rotateSampleByUniver = "<html><head></head><body><google data-copy-id=\"1rz7ZZ\" -sheets-html-origin=\"\"><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\"><colgroup><col width=\"73\"></colgroup>\n<tbody><tr style=\"height: 19px;\"><td>univer</td></tr><tr style=\"height: 46.67004020088826px;\"><td style=\"--data-rotate: (-45deg);\">univer</td></tr><tr style=\"height: 46.67004020088826px;\"><td style=\"--data-rotate: (45deg);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"--data-rotate: (0deg ,1);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"--data-rotate: (-90deg);\">univer</td></tr><tr style=\"height: 48.00140380859375px;\"><td style=\"--data-rotate: (90deg);\">univer</td></tr></tbody></table></google></body></html>";
 export declare const alignmentSampleByExcel = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\"\r\nxmlns:o=\"urn:schemas-microsoft-com:office:office\"\r\nxmlns:x=\"urn:schemas-microsoft-com:office:excel\"\r\nxmlns=\"http://www.w3.org/TR/REC-html40\">\r\n\r\n<head>\r\n<meta http-equiv=Content-Type content=\"text/html; charset=utf-8\">\r\n<meta name=ProgId content=Excel.Sheet>\r\n<meta name=Generator content=\"Microsoft Excel 15\">\r\n<link id=Main-File rel=Main-File\r\nhref=\"file:////Users/yuanbin/Library/Group%20Containers/UBF8T346G9.Office/TemporaryItems/msohtmlclip/clip.htm\">\r\n<link rel=File-List\r\nhref=\"file:////Users/yuanbin/Library/Group%20Containers/UBF8T346G9.Office/TemporaryItems/msohtmlclip/clip_filelist.xml\">\r\n<style>\r\n<!--table\r\n\t{mso-displayed-decimal-separator:\"\\.\";\r\n\tmso-displayed-thousand-separator:\"\\,\";}\r\n@page\r\n\t{margin:.75in .7in .75in .7in;\r\n\tmso-header-margin:.3in;\r\n\tmso-footer-margin:.3in;}\r\ntr\r\n\t{mso-height-source:auto;\r\n\tmso-ruby-visibility:none;}\r\ncol\r\n\t{mso-width-source:auto;\r\n\tmso-ruby-visibility:none;}\r\nbr\r\n\t{mso-data-placement:same-cell;}\r\ntd\r\n\t{padding-top:1px;\r\n\tpadding-right:1px;\r\n\tpadding-left:1px;\r\n\tmso-ignore:padding;\r\n\tcolor:black;\r\n\tfont-size:12.0pt;\r\n\tfont-weight:400;\r\n\tfont-style:normal;\r\n\ttext-decoration:none;\r\n\tfont-family:\u7B49\u7EBF;\r\n\tmso-generic-font-family:auto;\r\n\tmso-font-charset:134;\r\n\tmso-number-format:General;\r\n\ttext-align:general;\r\n\tvertical-align:middle;\r\n\tborder:none;\r\n\tmso-background-source:auto;\r\n\tmso-pattern:auto;\r\n\tmso-protection:locked visible;\r\n\twhite-space:nowrap;\r\n\tmso-rotate:0;}\r\n.xl65\r\n\t{text-align:left;\r\n\tvertical-align:bottom;}\r\n.xl66\r\n\t{text-align:right;\r\n\tvertical-align:bottom;}\r\n.xl67\r\n\t{text-align:center;\r\n\tvertical-align:bottom;}\r\n.xl68\r\n\t{vertical-align:top;}\r\n.xl69\r\n\t{color:#44546A;\r\n\tfont-size:11.0pt;\r\n\tfont-weight:700;}\r\n.xl70\r\n\t{vertical-align:bottom;}\r\nruby\r\n\t{ruby-align:left;}\r\nrt\r\n\t{color:windowtext;\r\n\tfont-size:9.0pt;\r\n\tfont-weight:400;\r\n\tfont-style:normal;\r\n\ttext-decoration:none;\r\n\tfont-family:\u7B49\u7EBF;\r\n\tmso-generic-font-family:auto;\r\n\tmso-font-charset:134;\r\n\tmso-char-type:none;\r\n\tdisplay:none;}\r\n-->\r\n</style>\r\n</head>\r\n\r\n<body link=\"#0563C1\" vlink=\"#954F72\">\r\n\r\n<table border=0 cellpadding=0 cellspacing=0 width=522 style='border-collapse:\r\n collapse;width:390pt'>\r\n <col width=87 span=6 style='width:65pt'>\r\n <tr height=88 style='mso-height-source:userset;height:66.0pt'>\r\n<!--StartFragment-->\r\n  <td height=88 class=xl65 width=87 style='height:66.0pt;width:65pt'>\u5DE6\u5BF9\u9F50</td>\r\n  <td class=xl66 width=87 style='width:65pt'>\u53F3\u5BF9\u9F50</td>\r\n  <td class=xl67 width=87 style='width:65pt'>\u4E2D\u95F4\u5BF9\u9F50</td>\r\n  <td class=xl68 width=87 style='width:65pt'>\u9876\u90E8</td>\r\n  <td class=xl70 width=87 style='width:65pt'>\u5E95\u90E8\u5BF9\u9F50</td>\r\n  <td class=xl69 width=87 style='width:65pt'>\u5C45\u4E2D\u5BF9\u9F50</td>\r\n<!--EndFragment-->\r\n </tr>\r\n</table>\r\n\r\n</body>\r\n\r\n</html>\r\n";
 export declare const alignmentSampleByGoogle = "<google-sheets-html-origin><style type=\"text/css\"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" border=\"1\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\" data-sheets-root=\"1\"><colgroup><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/><col width=\"100\"/></colgroup><tbody><tr style=\"height:65px;\"><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-family:Arial;font-size:12pt;font-weight:normal;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u5DE6\u5BF9\u9F50&quot;}\">\u5DE6\u5BF9\u9F50</td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-family:Arial;font-size:12pt;font-weight:normal;text-align:right;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u53F3\u5BF9\u9F50&quot;}\">\u53F3\u5BF9\u9F50</td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-family:Arial;font-size:12pt;font-weight:normal;text-align:center;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u4E2D\u95F4\u5BF9\u9F50&quot;}\">\u4E2D\u95F4\u5BF9\u9F50</td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:top;font-family:Arial;font-size:12pt;font-weight:normal;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u9876\u90E8&quot;}\">\u9876\u90E8</td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;font-family:Arial;font-size:12pt;font-weight:normal;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u5E95\u90E8\u5BF9\u9F50&quot;}\">\u5E95\u90E8\u5BF9\u9F50</td><td style=\"overflow:hidden;padding:2px 3px 2px 3px;vertical-align:middle;font-family:Arial;font-size:11pt;font-weight:bold;color:#44546a;\" data-sheets-value=\"{&quot;1&quot;:2,&quot;2&quot;:&quot;\u5C45\u4E2D\u5BF9\u9F50&quot;}\">\u5C45\u4E2D\u5BF9\u9F50</td></tr></tbody></table>";
 export declare const alignmentSampleByUniver = "<html><head></head><body><google data-copy-id=\"rJhHMI\" -sheets-html-origin=\"\"><table xmlns=\"http://www.w3.org/1999/xhtml\" cellspacing=\"0\" cellpadding=\"0\" dir=\"ltr\" style=\"table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none\"><colgroup><col width=\"73\"><col width=\"73\"><col width=\"73\"><col width=\"73\"><col width=\"73\"><col width=\"73\"></colgroup>\n<tbody><tr style=\"height: 66px;\"><td style=\"color: rgb(0, 0, 0); font-size: 12pt; text-align: left; vertical-align: bottom; font-family: \u7B49\u7EBF; \">\u5DE6\u5BF9\u9F50</td><td style=\"color: rgb(0, 0, 0); font-size: 12pt; text-align: right; vertical-align: bottom; font-family: \u7B49\u7EBF; \">\u53F3\u5BF9\u9F50</td><td style=\"color: rgb(0, 0, 0); font-size: 12pt; text-align: center; vertical-align: bottom; font-family: \u7B49\u7EBF; \">\u4E2D\u95F4\u5BF9\u9F50</td><td style=\"color: rgb(0, 0, 0); font-size: 12pt; vertical-align: top; font-family: \u7B49\u7EBF; \">\u9876\u90E8</td><td style=\"color: rgb(0, 0, 0); font-size: 12pt; vertical-align: bottom; font-family: \u7B49\u7EBF; \">\u5E95\u90E8\u5BF9\u9F50</td><td style=\"color: rgb(68, 84, 106); font-size: 11pt; vertical-align: middle; font-weight: bold; font-family: \u7B49\u7EBF; \">\u5C45\u4E2D\u5BF9\u9F50</td></tr></tbody></table></google></body></html>";
+export declare const plainTextByNotepad = "day\t2024\u5E74\u4E94\u4E00\u5047\u671F\uFF1A\u76F8\u8F8323\u5E74\t\u76F8\u8F8319\u5E74\r\n\u516C\u8DEF\u603B\u8BA1\t2.1\t24.4\r\n\u516C\u8DEF\u975E\u8425\u4E1A\t1.4\t39.2\r\n\u94C1\u8DEF\t1.4\t23.3\r\n\u6C11\u822A\t8.1\t11.1\r\n\u516C\u8DEF\u8425\u4E1A\u6027\t6.5\t-25.1\r\n\u6C34\u8FD0\t6\t-31.3\r\n";

package/lib/types/services/clipboard/html-to-usm/converter.d.ts CHANGED Viewed

@@ -16,14 +16,20 @@ interface IHtmlToUSMServiceProps {
 export declare class HtmlToUSMService {
     private static pluginList;
     static use(plugin: IPastePlugin): void;
+    private _styleMap;
     private _styleCache;
     private _styleRules;
     private _afterProcessRules;
-    private _htmlElement;
+    private _dom;
     private _getCurrentSkeleton;
     constructor(props: IHtmlToUSMServiceProps);
     convert(html: string): IUniverSheetCopyDataModel;
+    private _getStyleBySelectorText;
+    private _getStyle;
     private _parseTable;
+    private _parseTableByHtml;
+    private _parseCellHtml;
+    private _getCellTextAndRichText;
     private _generateDocumentDataModelSnapshot;
     private process;
     dispose(): void;

package/lib/types/services/clipboard/html-to-usm/parse-node-style.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import { ITextStyle } from '@univerjs/core';
-export declare function extractNodeStyle(node: HTMLElement, predefinedStyles?: CSSStyleDeclaration): ITextStyle;
+export declare function extractNodeStyle(node: HTMLElement, predefinedStyles?: Record<string, string>): ITextStyle;

package/lib/types/services/clipboard/html-to-usm/utils.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { IParagraph, IParagraphStyle, Nullable } from '@univerjs/core';
-export default function parseToDom(rawHtml: string): Element | null;
+export default function parseToDom(rawHtml: string): HTMLBodyElement;
 export declare function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle>;
 export declare function generateParagraphs(dataStream: string, prevParagraph?: IParagraph): IParagraph[];

package/lib/types/services/clipboard/utils.d.ts CHANGED Viewed

@@ -20,3 +20,4 @@ export declare function getRangeValuesMergeable(m1: IMutationInfo<ISetRangeValue
 export declare function mergeSetRangeValues(mutations: IMutationInfo[]): IMutationInfo<object>[];
 export declare function rangeIntersectWithDiscreteRange(range: IRange, discrete: IDiscreteRange): true | undefined;
 export declare function discreteRangeContainsRange(discrete: IDiscreteRange, range: IRange): boolean;
+export declare function convertTextToTable(text: string): string;

package/lib/types/services/mark-selection/mark-selection.service.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { Disposable, IUniverInstanceService, ThemeService } from '@univerjs/core
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { ISelectionWithStyle } from '@univerjs/sheets';
 import { ISelectionRenderService } from '../selection/selection-render.service';
-import { SelectionShape } from '../selection/selection-shape';
+import { SelectionControl } from '../selection/selection-shape';
 export interface IMarkSelectionService {
     addShape(selection: ISelectionWithStyle, exits?: string[], zIndex?: number): string | null;
@@ -16,7 +16,7 @@ interface IMarkSelectionInfo {
     subUnitId: string;
     selection: ISelectionWithStyle;
     zIndex: number;
-    control: SelectionShape | null;
+    control: SelectionControl | null;
     exits: string[];
 }
 export declare const IMarkSelectionService: import('@wendellhu/redi').IdentifierDecorator<IMarkSelectionService>;

package/lib/types/services/scroll-manager.service.d.ts CHANGED Viewed

@@ -1,19 +1,46 @@
 import { IUniverInstanceService, Nullable } from '@univerjs/core';
+import { BehaviorSubject } from 'rxjs';
 import { IRenderManagerService } from '@univerjs/engine-render';
+export interface IViewportScrollState {
+    scrollX: number;
+    scrollY: number;
+    viewportScrollX: number;
+    viewportScrollY: number;
+}
 export interface IScrollManagerParam {
+    /**
+     * offsetX from startRow, coordinate same as viewport, not scrollbar
+     */
     offsetX: number;
+    /**
+     * offsetY from startColumn, coordinate same as viewport, not scrollbar
+     */
     offsetY: number;
+    /**
+     * currrent start row in viewport visible area
+     */
     sheetViewStartRow: number;
+    /**
+     * current start column in viewport visible area
+     */
     sheetViewStartColumn: number;
+    /**
+     * overall offsetX from sheet cotent topleft, should be same as startRow * rowHeight + offsetY
+     * coordinate same as viewport, not scrollbar
+     */
     viewportScrollX?: number;
+    /**
+     * overall offsetY from sheet content topleft, should be same as startColumn * columnWidth + offsetX
+     * coordinate same as viewport, not scrollbar
+     */
     viewportScrollY?: number;
 }
 export interface IScrollManagerSearchParam {
     unitId: string;
     sheetId: string;
 }
-export interface IScrollManagerInsertParam extends IScrollManagerSearchParam, IScrollManagerParam {
+export interface IScrollManagerWithSearchParam extends IScrollManagerSearchParam, IScrollManagerParam {
 }
 export type IScrollInfo = Map<string, Map<string, IScrollManagerParam>>;
 /**
@@ -25,9 +52,27 @@ export type IScrollInfo = Map<string, Map<string, IScrollManagerParam>>;
 export declare class ScrollManagerService {
     private readonly _univerInstanceService;
     private readonly _renderManagerService;
-    private readonly _scrollInfo;
+    /**
+     * a map holds all scroll info for each sheet
+     */
+    private readonly _scrollInfoMap;
+    /**
+     * a subject for current sheet scrollInfo
+     */
     private readonly _scrollInfo$;
-    readonly scrollInfo$: import('rxjs').Observable<Nullable<IScrollManagerParam>>;
+    /**
+     * a subject for current sheet scrollInfo ( events, ex wheel event and point events add deltaXY to rawScrollInfo$)
+     */
+    readonly rawScrollInfo$: import('rxjs').Observable<Nullable<IScrollManagerParam>>;
+    /**
+     * a subject for current valid scrollInfo, viewport@_scrollCore would limit rawScrollInfo$ exclude negative value or over max value.
+     * use this subject not rawScrollInfo$ when get scrolling state of viewport.
+     */
+    readonly validViewportScrollInfo$: BehaviorSubject<Nullable<IViewportScrollState>>;
+    /**
+     * a subject for current valid scrollInfo, viewport@_scrollCore would limit rawScrollInfo$ exclude negative value or over max value.
+     * use this subject not rawScrollInfo$ when get scrolling state of viewport.
+     */
     private _searchParamForScroll;
     constructor(_univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService);
     dispose(): void;
@@ -39,26 +84,30 @@ export declare class ScrollManagerService {
     /**
      * set scrollInfo by cmd,
      * call _setScrollInfo twice after one scrolling.
-     * first time set scrollInfo bt scrollOperation, but offsetXY is derived from scroll event.
+     * first time set scrollInfo by scrollOperation, but offsetXY is derived from scroll event.
      * second time set scrollInfo by viewport.scrollTo(scrol.render-controller --> onScrollAfterObserver), this time offsetXY has been limited.
      *
-     * wheelevent --> sheetCanvasView -->  set-scroll.command('sheet.command.set-scroll-relative') --> scrollOperation --> this.setScrollInfo  --> scrollInfo$.next --> scroll.render-controller@viewportMain.scrollTo & notify -->
-     * scroll.render-controller@onScrollAfterObserver --> this.setScrollInfoToCurrSheetWithoutNotify --> this._setScrollInfo({}, false)
+     * wheelevent --> sheetCanvasView -->  set-scroll.command('sheet.command.set-scroll-relative') --> scrollOperation --> scrollManagerService.setScrollInfo  --> scrollInfo$.next --> scroll.render-controller@viewportMain.scrollTo & notify -->
+     * scroll.render-controller@onScrollAfter$ --> this.setScrollInfoToCurrSheetWithoutNotify --> this._setScrollInfo({}, false)
      * call _setScrollInfo again, a loop!, so we should call setScrollInfoToCurrSheetWithoutNotify
      * @param param
      */
-    setScrollInfo(param: IScrollManagerInsertParam): void;
-    setScrollInfoToCurrSheet(scrollInfo: IScrollManagerParam): void;
-    setScrollInfoToCurrSheetWithoutNotify(scroll: IScrollManagerParam): void;
+    setScrollInfoAndEmitEvent(param: IScrollManagerWithSearchParam): void;
+    setScrollInfoToCurrSheetAndEmitEvent(scrollInfo: IScrollManagerParam): void;
+    /**
+     * call _setScrollInfo but no _scrollInfo$.next
+     * @param scroll
+     */
+    justSetScrollInfoToCurrSheet(scroll: IScrollManagerParam): void;
     clear(): void;
-    calcViewportScrollFromOffset(scrollInfo: IScrollManagerInsertParam): {
+    calcViewportScrollFromRowColOffset(scrollInfo: IScrollManagerWithSearchParam): {
         scrollTop: number;
         scrollLeft: number;
-        viewportScrollX?: undefined;
-        viewportScrollY?: undefined;
+        overallScrollX?: undefined;
+        overallScrollY?: undefined;
     } | {
-        viewportScrollX: number;
-        viewportScrollY: number;
+        overallScrollX: number;
+        overallScrollY: number;
         scrollTop?: undefined;
         scrollLeft?: undefined;
     };

package/lib/types/services/selection/mobile-selection-render.service.d.ts ADDED Viewed

@@ -0,0 +1,179 @@
+import { IRange, IRangeWithCoord, ISelection, ISelectionCell, ISelectionCellWithMergeInfo, Nullable, InterceptorManager, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport, IRenderManagerService } from '@univerjs/engine-render';
+import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
+import { IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
+import { SelectionControl } from './selection-shape';
+import { IControlFillConfig, ISelectionRenderService } from './selection-render.service';
+import { MobileSelectionControl } from './mobile-selection-shape';
+declare enum ExpandingControl {
+    BOTTOM_RIGHT = "bottom-right",
+    TOP_LEFT = "top-left",
+    LEFT = "left",
+    RIGHT = "right",
+    TOP = "top",
+    BOTTOM = "bottom"
+}
+export declare class MobileSelectionRenderService implements ISelectionRenderService {
+    private readonly _themeService;
+    private readonly _shortcutService;
+    private readonly _renderManagerService;
+    private readonly _injector;
+    hasSelection: boolean;
+    private _pointerdownSub;
+    private _mainScenePointerUpSub;
+    private _scenePointerMoveSub;
+    private _scenePointerUpSub;
+    private _controlFillConfig$;
+    readonly controlFillConfig$: import('rxjs').Observable<IControlFillConfig | null>;
+    private _selectionControls;
+    private _activeCellRangeOfCurrSelection;
+    private _startOffsetX;
+    private _startOffsetY;
+    private _scrollTimer;
+    private _skeleton;
+    private _scene;
+    private _isHeaderHighlight;
+    private _isDetectMergedCell;
+    private _selectionStyle;
+    private _isSelectionEnabled;
+    private _isShowPreviousEnable;
+    private _isRemainLastEnable;
+    private _isSkipRemainLastEnable;
+    private _isSingleSelection;
+    private readonly _selectionMoveEnd$;
+    readonly selectionMoveEnd$: import('rxjs').Observable<ISelectionWithCoordAndStyle[]>;
+    private readonly _selectionMoving$;
+    /**
+     * Triggered during the drawing of the selection area.
+     */
+    readonly selectionMoving$: import('rxjs').Observable<ISelectionWithCoordAndStyle[]>;
+    private readonly _selectionMoveStart$;
+    /**
+     * Triggered during the start draw the selection area.
+     */
+    readonly selectionMoveStart$: import('rxjs').Observable<ISelectionWithCoordAndStyle[]>;
+    private _activeViewport;
+    /**
+     * This service relies on the scene and skeleton to work
+     * Use usable$ to check if this service works
+     */
+    private readonly _usable$;
+    readonly usable$: import('rxjs').Observable<boolean>;
+    interceptor: InterceptorManager<{
+        RANGE_MOVE_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, null>;
+        RANGE_FILL_PERMISSION_CHECK: import('@univerjs/core').IInterceptor<boolean, {
+            x: number;
+            y: number;
+            skeleton: SpreadsheetSkeleton;
+            scene: Scene;
+        }>;
+    }>;
+    expandingControlMode: ExpandingControl;
+    constructor(_themeService: ThemeService, _shortcutService: IShortcutService, _renderManagerService: IRenderManagerService, _injector: Injector);
+    enableHeaderHighlight(): void;
+    disableHeaderHighlight(): void;
+    enableDetectMergedCell(): void;
+    disableDetectMergedCell(): void;
+    setStyle(style: ISelectionStyle): void;
+    resetStyle(): void;
+    enableSelection(): void;
+    disableSelection(): void;
+    enableShowPrevious(): void;
+    disableShowPrevious(): void;
+    enableRemainLast(): void;
+    disableRemainLast(): void;
+    enableSkipRemainLast(): void;
+    disableSkipRemainLast(): void;
+    enableSingleSelection(): void;
+    disableSingleSelection(): void;
+    getViewPort(): Viewport;
+    /**
+     * add a selection
+     *
+     * in PC:init & pointerup would call this function.
+     *
+     * init
+     * selectionController@_initSkeletonChangeListener --> selectionManagerService.add --> selectionManagerService._selectionMoveEnd$ --> this.addControlToCurrentByRangeData
+     *
+     * selectionMoveEnd$ --> this.addSelectionControlBySelectionData
+     *
+     *
+     *
+     * pointer
+     * engine@_pointerDownEvent --> spreadsheet?.onPointerDownObserve --> eventTrigger --> scene@disableEvent() --> then scene.input-manager currentObject is always scene until scene@enableEvent.
+     * engine@_pointerUpEvent --> scene.input-manager@_onPointerUp --> this._selectionMoveEnd$ --> _selectionManagerService.selectionMoveEnd$ --> this.addControlToCurrentByRangeData
+     *
+     * but in mobile, we do not call disableEvent() in eventTrigger,
+     * so pointerup --> scene.input-manager currentObject is spreadsheet --> this.eventTrigger
+     *
+     *
+     *
+     * @param selectionData
+     */
+    addSelectionControlBySelectionData(selectionData: ISelectionWithCoordAndStyle): void;
+    newSelectionControl(scene: Scene, rangeType: RANGE_TYPE): MobileSelectionControl;
+    updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
+    refreshSelectionMoveStart(): void;
+    changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;
+    getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
+    getSelectionControls(): SelectionControl[];
+    private _clearSelectionControls;
+    private _getFreeze;
+    private _getViewportByCell;
+    /**
+     * Returns the list of active ranges in the active sheet or null if there are no active ranges.
+     * If there is a single range selected, this method behaves like a getActiveRange() call.
+     */
+    getActiveSelections(): Nullable<ISelection[]>;
+    /**
+     * Returns the selected range in the active sheet, or null if there is no active range. If multiple ranges are selected this method returns only the last selected range.
+     */
+    getActiveRange(): Nullable<IRange>;
+    /**
+     * get last selection control
+     */
+    getActiveSelectionControl(): Nullable<SelectionControl>;
+    endSelection(): void;
+    reset(): void;
+    resetAndEndSelection(): void;
+    expandingSelection: boolean;
+    /**
+     * invoked when pointerup or longpress on spreadsheet, or pointerdown on row&col
+     * then move curr selection to cell at cursor
+     * Main perpose to create a new selection, or update curr selection to a new range.
+     * @param evt
+     * @param _zIndex
+     * @param rangeType
+     * @param viewport
+     */
+    eventTrigger(evt: IPointerEvent | IMouseEvent, _zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport): false | undefined;
+    /**
+     *
+     * @param evt component point event
+     * @param style selection style, Styles for user-customized selectors
+     * @param zIndex Stacking order of the selection object
+     * @param rangeType Determines whether the selection is made normally according to the range or by rows and columns
+     *
+     * invoked by selection.render-controller@pointerDownObserver
+     *
+     * derived from eventTrigger
+     */
+    private _fillControlPointerDownHandler;
+    attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
+    attachRangeWithCoord(range: IRange): Nullable<IRangeWithCoord>;
+    attachPrimaryWithCoord(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithMergeInfo>;
+    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
+    /**
+     * When mousedown and mouseup need to go to the coordination and undo stack, when mousemove does not need to go to the coordination and undo stack
+     */
+    private _movingHandler;
+    /**
+     * rm pointerUp & pointerMove Observer on scene
+     */
+    private _endSelection;
+    private _addCancelObserver;
+    private _getCellRangeByCursorPosition;
+}
+export {};

package/lib/types/services/selection/mobile-selection-shape.d.ts ADDED Viewed

@@ -0,0 +1,53 @@
+import { IRangeWithCoord, Nullable, ThemeService, RANGE_TYPE } from '@univerjs/core';
+import { IRectProps, Scene, Rect } from '@univerjs/engine-render';
+import { ISelectionStyle } from '@univerjs/sheets';
+import { SelectionControl } from './selection-shape';
+export declare class MobileSelectionControl extends SelectionControl {
+    protected _scene: Scene;
+    protected _zIndex: number;
+    protected _isHeaderHighlight: boolean;
+    protected readonly _themeService: ThemeService;
+    protected _rangeType: RANGE_TYPE;
+    /**
+     * topLeft controlPointer, it is not visible, just transparent, for handling event.
+     */
+    private _fillControlTopLeft;
+    /**
+     * bottomRight controlPointer, it is not visible, just transparent, for handling event.
+     */
+    private _fillControlBottomRight;
+    /**
+     * a very small visible point, placed in control pointer
+     */
+    private _fillControlTopLeftInner;
+    /**
+     * a very small visible point, placed in control pointer
+     */
+    private _fillControlBottomRightInner;
+    constructor(_scene: Scene, _zIndex: number, _isHeaderHighlight: boolean, _themeService: ThemeService, _rangeType?: RANGE_TYPE);
+    initControlPoints(): void;
+    get fillControlTopLeft(): Rect<IRectProps> | null;
+    set fillControlTopLeft(value: Rect);
+    get fillControlBottomRight(): Rect<IRectProps> | null;
+    set fillControlBottomRight(value: Rect);
+    get rangeType(): RANGE_TYPE;
+    set rangeType(value: RANGE_TYPE);
+    dispose(): void;
+    updateRange(range: IRangeWithCoord): void;
+    protected _updateControl(style: Nullable<ISelectionStyle>, rowHeaderWidth: number, columnHeaderHeight: number): void;
+    getViewportMainScrollInfo(): {
+        viewportScrollX: number;
+        viewportScrollY: number;
+        width: number;
+        height: number;
+    };
+    /**
+     * Mainly for row & col selection control point position. update control point position by when scrolling.
+     * @param viewportScrollX viewportScrollX
+     * @param viewportScrollY
+     * @param sheetContentWidth
+     * @param sheetContentHeight max sheet content height, for very short sheet, control pointer shoud not out of sheet
+     */
+    transformControlPoint(viewportScrollX?: number, viewportScrollY?: number, sheetContentWidth?: number, sheetContentHeight?: number): void;
+}

package/lib/types/services/selection/selection-render-model.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { IRangeWithCoord, ISelectionCellWithCoord, ISelectionWithCoord, Nullable, RANGE_TYPE } from '@univerjs/core';
+import { IRangeWithCoord, ISelectionCellWithMergeInfo, ISelectionWithCoord, Nullable, RANGE_TYPE } from '@univerjs/core';
 export declare class SelectionRenderModel implements IRangeWithCoord {
     private _startColumn;
@@ -12,6 +12,11 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
     private _startY;
     private _endX;
     private _endY;
+    /**
+     * highlight cell of selection
+     * when there is no merge info
+     * top left cell of current selection (or bottomLeft of current selection)
+     */
     private _currentCell;
     private _rangeType;
     get startColumn(): number;
@@ -34,7 +39,10 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
      * value from { startY, endY, startX, endX } = getCellPositionByIndex in basics/tools
      */
     get endY(): number;
-    get currentCell(): Nullable<ISelectionCellWithCoord>;
+    /**
+     * highlight cell of selection
+     */
+    get currentCell(): Nullable<ISelectionCellWithMergeInfo>;
     get rangeType(): RANGE_TYPE;
     isEqual(rangeWithCoord: IRangeWithCoord): boolean;
     isInclude(rangeWithCoord: IRangeWithCoord): boolean;
@@ -50,10 +58,11 @@ export declare class SelectionRenderModel implements IRangeWithCoord {
         endY: number;
         rangeType: RANGE_TYPE;
     };
-    getCell(): Nullable<ISelectionCellWithCoord>;
+    getCell(): Nullable<ISelectionCellWithMergeInfo>;
     getRangeType(): RANGE_TYPE;
+    setRangeType(rangeType: RANGE_TYPE): void;
     getValue(): ISelectionWithCoord;
-    setValue(newSelectionRange: IRangeWithCoord, currentCell: Nullable<ISelectionCellWithCoord>): void;
-    setCurrentCell(currentCell: Nullable<ISelectionCellWithCoord>): void;
+    setValue(newSelectionRange: IRangeWithCoord, currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
+    setCurrentCell(currentCell: Nullable<ISelectionCellWithMergeInfo>): void;
     clearCurrentCell(): void;
 }

package/lib/types/services/selection/selection-render.service.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
-import { IInterceptor, IRange, IRangeWithCoord, ISelection, ISelectionCell, ISelectionCellWithCoord, Nullable, InterceptorManager, IUniverInstanceService, RANGE_TYPE, ThemeService } from '@univerjs/core';
+import { IInterceptor, IRange, IRangeWithCoord, ISelection, ISelectionCell, ISelectionCellWithMergeInfo, Nullable, InterceptorManager, RANGE_TYPE, ThemeService } from '@univerjs/core';
 import { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport, IRenderManagerService, ScrollTimerType } from '@univerjs/engine-render';
 import { ISelectionStyle, ISelectionWithCoordAndStyle, ISelectionWithStyle } from '@univerjs/sheets';
 import { IShortcutService } from '@univerjs/ui';
 import { Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
-import { SelectionShape } from './selection-shape';
+import { SelectionControl as SelectionShape } from './selection-shape';
 export interface IControlFillConfig {
     oldRange: IRange;
@@ -39,20 +39,20 @@ export interface ISelectionRenderService {
     disableRemainLast(): void;
     enableSkipRemainLast(): void;
     disableSkipRemainLast(): void;
-    addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;
+    addSelectionControlBySelectionData(data: ISelectionWithCoordAndStyle): void;
     updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
     changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;
     /** @deprecated This should not be provided by the selection render service. */
     getViewPort(): Viewport;
-    getCurrentControls(): SelectionShape[];
+    getSelectionControls(): SelectionShape[];
     getActiveSelections(): Nullable<ISelection[]>;
     getActiveRange(): Nullable<IRange>;
-    getActiveSelection(): Nullable<SelectionShape>;
+    getActiveSelectionControl(): Nullable<SelectionShape>;
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
     attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
     attachRangeWithCoord(range: IRange): Nullable<IRangeWithCoord>;
-    attachPrimaryWithCoord(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;
-    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithCoord>;
+    attachPrimaryWithCoord(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithMergeInfo>;
+    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
     eventTrigger(evt: IPointerEvent | IMouseEvent, zIndex: number, rangeType: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): void;
     reset(): void;
     refreshSelectionMoveStart(): void;
@@ -83,9 +83,10 @@ export declare class SelectionRenderService implements ISelectionRenderService {
     private readonly _themeService;
     private readonly _shortcutService;
     private readonly _renderManagerService;
-    private readonly _instanceService;
     private readonly _injector;
     hasSelection: boolean;
+    private _pointerdownSub;
+    private _mainScenePointerUpSub;
     private _scenePointerMoveSub;
     private _scenePointerUpSub;
     private _controlFillConfig$;
@@ -95,8 +96,6 @@ export declare class SelectionRenderService implements ISelectionRenderService {
     private _startOffsetX;
     private _startOffsetY;
     private _scrollTimer;
-    private _pointerdownSub;
-    private _mainScenePointerUpSub;
     private _skeleton;
     private _scene;
     private _isHeaderHighlight;
@@ -135,7 +134,7 @@ export declare class SelectionRenderService implements ISelectionRenderService {
             scene: Scene;
         }>;
     }>;
-    constructor(_themeService: ThemeService, _shortcutService: IShortcutService, _renderManagerService: IRenderManagerService, _instanceService: IUniverInstanceService, _injector: Injector);
+    constructor(_themeService: ThemeService, _shortcutService: IShortcutService, _renderManagerService: IRenderManagerService, _injector: Injector);
     enableHeaderHighlight(): void;
     disableHeaderHighlight(): void;
     enableDetectMergedCell(): void;
@@ -155,15 +154,14 @@ export declare class SelectionRenderService implements ISelectionRenderService {
     getViewPort(): Viewport;
     /**
      * add a selection
-     * @param selectionRange
-     * @param curCellRange
+     * @param data
      */
-    addControlToCurrentByRangeData(data: ISelectionWithCoordAndStyle): void;
+    addSelectionControlBySelectionData(data: ISelectionWithCoordAndStyle): void;
     updateControlForCurrentByRangeData(selections: ISelectionWithCoordAndStyle[]): void;
     refreshSelectionMoveStart(): void;
     changeRuntime(skeleton: Nullable<SpreadsheetSkeleton>, scene: Nullable<Scene>, viewport?: Viewport): void;
     getSelectionDataWithStyle(): ISelectionWithCoordAndStyle[];
-    getCurrentControls(): SelectionShape[];
+    getSelectionControls(): SelectionShape[];
     private _clearSelectionControls;
     private _getFreeze;
     private _getViewportByCell;
@@ -184,8 +182,12 @@ export declare class SelectionRenderService implements ISelectionRenderService {
      * get active selection control
      * @returns
      */
-    getActiveSelection(): Nullable<SelectionShape>;
+    getActiveSelectionControl(): Nullable<SelectionShape>;
     endSelection(): void;
+    /**
+     * first, clear All selection controls
+     * then unsubscribe all events
+     */
     reset(): void;
     resetAndEndSelection(): void;
     /**
@@ -198,8 +200,8 @@ export declare class SelectionRenderService implements ISelectionRenderService {
     eventTrigger(evt: IPointerEvent | IMouseEvent, zIndex?: number, rangeType?: RANGE_TYPE, viewport?: Viewport, scrollTimerType?: ScrollTimerType): false | undefined;
     attachSelectionWithCoord(selectionWithStyle: ISelectionWithStyle): ISelectionWithCoordAndStyle;
     attachRangeWithCoord(range: IRange): Nullable<IRangeWithCoord>;
-    attachPrimaryWithCoord(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithCoord>;
-    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithCoord>;
+    attachPrimaryWithCoord(primary: Nullable<ISelectionCell>): Nullable<ISelectionCellWithMergeInfo>;
+    getSelectionCellByPosition(x: number, y: number): Nullable<ISelectionCellWithMergeInfo>;
     /**
      * When mousedown and mouseup need to go to the coordination and undo stack, when mousemove does not need to go to the coordination and undo stack
      */